Commit Graph

7965 Commits

Author SHA1 Message Date
Brad King 358ceee5d8 Merge topic 'curl_netrc_options'
d45aa38a Add dev notes for topic 'curl_netrc_options'
60c272b6 ExternalProject: Add support for NETRC and NETRC_FILE suboption
754e39dd Add testcases for file(DOWNLOAD|UPLOAD) netrc options
5d67e902 file(DOWNLOAD|UPLOAD): Add 'NETRC' and 'NETRC_FILE' suboption

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
Merge-request: !1376
2017-10-19 09:27:43 -04:00
Brad King d209275330 Merge topic 'ti-compiler-depfile-support'
ad9327d9 Compiler/TI: Add support for depfile generation for Ninja

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1389
2017-10-19 09:27:09 -04:00
Shane Parris 60c272b69a ExternalProject: Add support for NETRC and NETRC_FILE suboption 2017-10-18 15:21:43 -04:00
Nico Müller ad9327d936 Compiler/TI: Add support for depfile generation for Ninja
TI C/C++ compiler are now able to generate dependency files during
compilation.

Fixes: #17360
2017-10-18 09:43:22 -04:00
Brad King b0b94cdec5 Merge topic 'cmake-open'
96d642c7 cmake-gui: Use cmake::Open to open generated project
5de37a4a cmake: Add --open option for IDE generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
Merge-request: !1337
2017-10-18 09:37:59 -04:00
Brad King 0dba1db9d5 Merge topic 'module-fetchcontent'
1e56634f FetchContent: Add tests
60e74d2f FetchContent: New module for populating content at configure time

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1306
2017-10-18 09:37:26 -04:00
Brad King 1f436c5803 Merge topic 'findopenmp-lib-paths'
f4cc7109 FindOpenMP: Improve OMP libraries search

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1385
2017-10-18 09:35:29 -04:00
Christian Pfeiffer f4cc71099a FindOpenMP: Improve OMP libraries search
This supports libraries given as full path and filters libraries given
in CMAKE_<LANG>_STANDARD_LIBRARIES.

Fixes: #17351
2017-10-17 09:53:57 -04:00
Brad King b361990007 Merge topic 'Linux-CUDA-OpenCL'
060fd233 FindOpenCL: Add support for CUDA OpenCL on Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1387
2017-10-17 08:32:53 -04:00
Craig Scott 60e74d2f19 FetchContent: New module for populating content at configure time 2017-10-17 08:07:09 +11:00
Brad King 800c0e8105 Merge topic 'UseJava-add_jar-split-build-and-output-dirs'
48dcb2f0 UseJava: add_jar OUTPUT_DIR option used only for jar generation.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1380
2017-10-16 09:48:53 -04:00
Brad King 9de7ae6e5e Merge topic 'cpack-wix-cygwin'
e1409101 cpack wix: support WiX generator on Cygwin
e258fe03 cpack wix: fix path error on cygwin

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1367
2017-10-16 09:48:02 -04:00
Takenori Yamamoto 060fd23313 FindOpenCL: Add support for CUDA OpenCL on Linux
When setting CUDA_PATH, the include directory ($CUDA_PATH/include) was found, but libOpenCL.so was not found. This patch resloved the issue.
2017-10-15 15:18:17 +09:00
Gregor Jasny 5de37a4a64 cmake: Add --open option for IDE generators 2017-10-13 21:28:34 +02:00
Stephen Sorley e258fe0396 cpack wix: fix path error on cygwin
Under Cygwin, file(TO_CMAKE_PATH...) outputs invalid paths when given
a Windows path as input (the colon after the drive letter gets replaced
by a semicolon).

As a workaround, just use a string replace to change the slashes instead.
2017-10-13 11:48:36 -04:00
Brad King 8df52df84d Merge topic 'FindPythonLibs-names-per-dir'
192ab741 FindPythonLibs: Allow find_library to search paths from system environment
3976a106 FindPythonLibs: Prefer libs early in search path regardless of name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1378
2017-10-12 09:20:09 -04:00
Brad King 0d508b1ee1 Merge topic 'FindXMLRPC-no-includes'
e7720a0f FindXMLRPC: Tolerate no include directories
b1aa8a47 FindXMLRPC: Drop unnecessary exec_program code paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1377
2017-10-12 09:19:53 -04:00
Brad King 016daf0391 Merge topic 'clang-msvc-help'
b6d3a1c0 Clang: Diagnose unsupported GNU-like clang targeting MSVC ABI

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1373
2017-10-12 09:15:57 -04:00
Marc Chevrier 48dcb2f055 UseJava: add_jar OUTPUT_DIR option used only for jar generation.
Build artifacts go to CMAKE_CURRENT_BINARY_DIR subdirectory in all cases.

Fixes: #17341
2017-10-12 13:05:17 +02:00
Brad King e7720a0f3f FindXMLRPC: Tolerate no include directories
`xmlrpc-c-config $modules --cflags` may report no `-I` flags if the
headers are in a standard location like `/usr/include`.  In this case
it is okay for `XMLRPC_INCLUDE_DIRS` to be empty.

Ideally the `--cflags` output should be used as hints for a `find_path`
call to really find the headers as we do for other find modules, but
simply assuming no explicit include directories are needed is good
enough for now.

Fixes: #17347
2017-10-11 11:19:03 -04:00
Brad King 192ab741ec FindPythonLibs: Allow find_library to search paths from system environment
Drop the `NO_SYSTEM_ENVIRONMENT_PATH` option from our `find_library`
calls.  No other find modules do this.  Also, since commit
v3.3.0-rc1~430^2 (Teach find_(library|file|path) to get prefixes from
PATH, 2015-02-18) we always search the `lib` directory of each prefix
before the `bin` directory and so should prefer the non-`.dll` name.

Issue: #17336
2017-10-11 11:07:58 -04:00
Brad King 3976a1066a FindPythonLibs: Prefer libs early in search path regardless of name
Add `NAMES_PER_DIR` to all `find_library` invocations so that we
consider all possible names in each search directory before moving on to
the next directory.  This helps find the package that appears earliest
in the search path regardless of how it names its libraries.

Fixes: #17336
2017-10-11 10:58:22 -04:00
Brad King b1aa8a4773 FindXMLRPC: Drop unnecessary exec_program code paths
We always have `execute_process` now, so drop our ancient `exec_program`
code paths that are never used anymore.
2017-10-11 10:31:32 -04:00
Brad King 4594880be7 Merge topic 'cpack-deb-mr-1296-fix'
c5db2f9a CPack/Deb: fix for regex passing even if invalid characters are present
529729d6 CPack/Deb: CPACK_DEBIAN_PACKAGE_VERSION regex testing exception

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1375
2017-10-11 08:26:24 -04:00
Brad King 7237d9489a Merge topic 'ExternalProject-CMP0054'
491d2108 ExternalProject: Avoid if() auto-dereferene in quoted arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1369
2017-10-11 08:21:14 -04:00
Brad King 491d210898 ExternalProject: Avoid if() auto-dereferene in quoted arguments
The implementation of this module doesn't expect such dereferences
to happen, but can when a project sets a variable called `x`.
Set `CMP0054` explicitly to get its NEW behavior.

Fixes: #17335
2017-10-11 08:19:58 -04:00
Brad King 027bcee513 Merge topic 'UseJava_OUTPUT_DIR'
dead049e UseJava: OUTPUT_DIR must exists in all cases.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1368
2017-10-11 08:18:50 -04:00
Domen Vrankar c5db2f9a0f CPack/Deb: fix for regex passing even if invalid characters are present
Regex [+-~] passes all characters between + and ~ and not only
+, - and ~
2017-10-11 00:10:10 +02:00
Domen Vrankar 529729d6e7 CPack/Deb: CPACK_DEBIAN_PACKAGE_VERSION regex testing exception
CPACK_DEBIAN_PACKAGE_VERSION variable could in the past also
contain release and epoch version so regex test should expect
the entire versioning if both CPACK_DEBIAN_PACKAGE_RELEASE
and CPACK_DEBIAN_PACKAGE_EPOCH are not set.
Also since the checks were not performed in the past the regex
test of CPACK_DEBIAN_PACKAGE_VERSION variable content should
only report author warnings instead of errors in case of the
test fail.

Fixes: #17339
2017-10-11 00:10:01 +02:00
Brad King b6d3a1c09a Clang: Diagnose unsupported GNU-like clang targeting MSVC ABI
The LLVM/Clang installer on Windows provides a `LLVM/bin` directory
containing `clang.exe` and `clang++.exe` command-line tools that have a
GNU-like command-line but target the MSVC ABI (instead of MinGW).  We
do not support this combination, so diagnose and reject it explicitly.
Tell users what to do to use the `clang-cl.exe` tool instead.

Issue: #16439
2017-10-10 14:56:43 -04:00
Brad King e5f1be0f64 Merge branch 'FindCUDA-cuda-9-nppi' into release-3.10
Merge-request: !1360
2017-10-10 08:59:51 -04:00
Brad King dba09a3c21 Merge topic 'FindProtobuf-doc-typo'
107fe8d5 FindProtobuf: fix documentation typo

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1359
2017-10-10 08:58:07 -04:00
Brad King ea6e5903e7 Merge topic 'ipo-escape-toolchain-path'
11f4c19d IPO: Fix support for spaces in path to archive tools

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
Merge-request: !1356
2017-10-10 08:57:05 -04:00
Brad King e110ab9e21 Merge topic 'FindCUDA-cuda-9-nppi'
16589bf4 FindCUDA: Update for CUDA 9 breakup of nppi into multiple libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1360
2017-10-10 08:52:35 -04:00
Brad King 6702ace882 Merge topic 'FindJava-tolerant-versions'
6feb0c33 FindJava: Revise version parsing to support Java 9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1355
2017-10-10 08:51:03 -04:00
Marc Chevrier dead049e0b UseJava: OUTPUT_DIR must exists in all cases.
Fixes: #17316
2017-10-10 10:00:23 +02:00
Robert Maynard 16589bf46f FindCUDA: Update for CUDA 9 breakup of nppi into multiple libraries
Fixes: #17310
2017-10-06 11:05:35 -04:00
Brad King 9111c17767 Merge branch 'FindProtobuf-doc-typo' into release-3.10
Merge-request: !1359
2017-10-06 09:21:38 -04:00
Brad King 71a2fe2753 Merge branch 'ipo-escape-toolchain-path' into release-3.10
Merge-request: !1356
2017-10-06 09:21:27 -04:00
André Apitzsch 107fe8d5e4 FindProtobuf: fix documentation typo
Fix typo in documentation added by commit v3.10.0-rc1~18^2
(FindProtobuf: add flag to allow descriptor files to be generated,
2017-09-21).
2017-10-06 09:18:48 -04:00
Thomas Stenersen 11f4c19d7b IPO: Fix support for spaces in path to archive tools
In the normal archiving rules the ``<CMAKE_AR>`` placeholder is replaced
by the generators with a properly-quoted path to the tool.  In the IPO
rules we specify the tools directly, so we need to quote them.

Fixes: #17326
2017-10-06 08:15:55 -04:00
Brad King 25510a09d5 Merge branch 'FindJava-tolerant-versions' into release-3.10
Merge-request: !1355
2017-10-06 07:30:07 -04:00
Brad King 6feb0c3318 FindJava: Revise version parsing to support Java 9
Java 9 has only one component.  Revise the logic to tolerate any number
of version components 1 through 4.  Fix the parsing of individual
components.

Fixes: #17325
2017-10-06 07:29:30 -04:00
Brad King 7a31da43b1 Merge branch 'findopenmp-fix-verbose' into release-3.10
Merge-request: !1348
2017-10-06 07:18:13 -04:00
Brad King e67eb42fa1 Merge topic 'findopenmp-fix-verbose'
e25d88ec FindOpenMP: Fix link flags being used for compile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1348
2017-10-06 07:15:24 -04:00
Christian Pfeiffer e25d88ecb9 FindOpenMP: Fix link flags being used for compile
Fixes: #17307
2017-10-05 17:02:56 +02:00
Brad King 4ffa4ddd80 Merge topic 'cuda-default-link-launcher'
7914fb82 CUDA: Fix default selection of host compiler used to drive linking

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1341
2017-10-05 07:36:53 -04:00
Brad King 69257d456a Merge topic 'FindCUDA-run_nvcc-CMP0007'
8b09c20c FindCUDA: Fix CMP0007 warning in run_nvcc.cmake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1340
2017-10-05 07:36:03 -04:00
Brad King dbb16722ee Merge topic 'find-matlab-r2017b'
f156b2fb FindMatlab: Add support for MATLAB 2017b

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Raffi Enficiaud <raffi.enficiaud@free.fr>
Merge-request: !1343
2017-10-05 07:34:49 -04:00
Christian Pfeiffer 3120615739 FindOpenMP: Fix version if OpenMP doesn't work 2017-10-04 19:53:48 +02:00