summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'curl_netrc_options'Brad King2017-10-192-2/+46
|\ | | | | | | | | | | | | | | | | | | | | 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
| * ExternalProject: Add support for NETRC and NETRC_FILE suboptionShane Parris2017-10-182-2/+46
| |
* | Merge topic 'ti-compiler-depfile-support'Brad King2017-10-192-0/+4
|\ \ | | | | | | | | | | | | | | | | | | ad9327d9 Compiler/TI: Add support for depfile generation for Ninja Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1389
| * | Compiler/TI: Add support for depfile generation for NinjaNico Müller2017-10-182-0/+4
| | | | | | | | | | | | | | | | | | | | | TI C/C++ compiler are now able to generate dependency files during compilation. Fixes: #17360
* | | Merge topic 'cmake-open'Brad King2017-10-181-0/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | cmake: Add --open option for IDE generatorsGregor Jasny2017-10-131-0/+23
| | | |
* | | | Merge topic 'module-fetchcontent'Brad King2017-10-182-0/+935
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e56634f FetchContent: Add tests 60e74d2f FetchContent: New module for populating content at configure time Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1306
| * | | | FetchContent: New module for populating content at configure timeCraig Scott2017-10-162-0/+935
| | | | |
* | | | | Merge topic 'findopenmp-lib-paths'Brad King2017-10-181-7/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f4cc7109 FindOpenMP: Improve OMP libraries search Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1385
| * | | | | FindOpenMP: Improve OMP libraries searchChristian Pfeiffer2017-10-171-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This supports libraries given as full path and filters libraries given in CMAKE_<LANG>_STANDARD_LIBRARIES. Fixes: #17351
* | | | | | Merge topic 'Linux-CUDA-OpenCL'Brad King2017-10-171-1/+4
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 060fd233 FindOpenCL: Add support for CUDA OpenCL on Linux Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1387
| * | | | | FindOpenCL: Add support for CUDA OpenCL on LinuxTakenori Yamamoto2017-10-151-1/+4
| | |_|/ / | |/| | | | | | | | | | | | | When setting CUDA_PATH, the include directory ($CUDA_PATH/include) was found, but libOpenCL.so was not found. This patch resloved the issue.
* | | | | Merge topic 'UseJava-add_jar-split-build-and-output-dirs'Brad King2017-10-161-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 48dcb2f0 UseJava: add_jar OUTPUT_DIR option used only for jar generation. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1380
| * | | | | UseJava: add_jar OUTPUT_DIR option used only for jar generation.Marc Chevrier2017-10-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build artifacts go to CMAKE_CURRENT_BINARY_DIR subdirectory in all cases. Fixes: #17341
* | | | | | Merge topic 'cpack-wix-cygwin'Brad King2017-10-161-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | cpack wix: fix path error on cygwinStephen Sorley2017-10-131-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge topic 'FindPythonLibs-names-per-dir'Brad King2017-10-121-4/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | FindPythonLibs: Allow find_library to search paths from system environmentBrad King2017-10-111-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | FindPythonLibs: Prefer libs early in search path regardless of nameBrad King2017-10-111-0/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge topic 'FindXMLRPC-no-includes'Brad King2017-10-121-29/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e7720a0f FindXMLRPC: Tolerate no include directories b1aa8a47 FindXMLRPC: Drop unnecessary exec_program code paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1377
| * | | | | FindXMLRPC: Tolerate no include directoriesBrad King2017-10-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `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
| * | | | | FindXMLRPC: Drop unnecessary exec_program code pathsBrad King2017-10-111-28/+12
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | We always have `execute_process` now, so drop our ancient `exec_program` code paths that are never used anymore.
* | | | | Merge topic 'clang-msvc-help'Brad King2017-10-123-0/+37
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | b6d3a1c0 Clang: Diagnose unsupported GNU-like clang targeting MSVC ABI Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1373
| * | | | Clang: Diagnose unsupported GNU-like clang targeting MSVC ABIBrad King2017-10-103-0/+37
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge topic 'cpack-deb-mr-1296-fix'Brad King2017-10-111-6/+33
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | CPack/Deb: fix for regex passing even if invalid characters are presentDomen Vrankar2017-10-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Regex [+-~] passes all characters between + and ~ and not only +, - and ~
| * | | | CPack/Deb: CPACK_DEBIAN_PACKAGE_VERSION regex testing exceptionDomen Vrankar2017-10-101-6/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge branch 'FindCUDA-cuda-9-nppi' into release-3.10Brad King2017-10-101-1/+39
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1360
| * \ \ \ \ Merge branch 'FindProtobuf-doc-typo' into release-3.10Brad King2017-10-061-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1359
| * \ \ \ \ \ Merge branch 'ipo-escape-toolchain-path' into release-3.10Brad King2017-10-062-6/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1356
| * \ \ \ \ \ \ Merge branch 'FindJava-tolerant-versions' into release-3.10Brad King2017-10-061-25/+42
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1355
| * \ \ \ \ \ \ \ Merge branch 'findopenmp-fix-verbose' into release-3.10Brad King2017-10-061-2/+13
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | | Merge-request: !1348
* | | | | | | | Merge topic 'ExternalProject-CMP0054'Brad King2017-10-111-0/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 491d2108 ExternalProject: Avoid if() auto-dereferene in quoted arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1369
| * | | | | | | | ExternalProject: Avoid if() auto-dereferene in quoted argumentsBrad King2017-10-111-0/+5
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge topic 'UseJava_OUTPUT_DIR'Brad King2017-10-111-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dead049e UseJava: OUTPUT_DIR must exists in all cases. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1368
| * | | | | | | | UseJava: OUTPUT_DIR must exists in all cases.Marc Chevrier2017-10-101-0/+2
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Fixes: #17316
* | | | | | | | Merge topic 'FindProtobuf-doc-typo'Brad King2017-10-101-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 107fe8d5 FindProtobuf: fix documentation typo Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1359
| * | | | | | | FindProtobuf: fix documentation typoAndré Apitzsch2017-10-061-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* | | | | | | Merge topic 'ipo-escape-toolchain-path'Brad King2017-10-102-6/+6
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | IPO: Fix support for spaces in path to archive toolsThomas Stenersen2017-10-062-6/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge topic 'FindCUDA-cuda-9-nppi'Brad King2017-10-101-1/+39
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 16589bf4 FindCUDA: Update for CUDA 9 breakup of nppi into multiple libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1360
| * | | | | FindCUDA: Update for CUDA 9 breakup of nppi into multiple librariesRobert Maynard2017-10-061-1/+39
| |/ / / / | | | | | | | | | | | | | | | Fixes: #17310
* | | | | Merge topic 'FindJava-tolerant-versions'Brad King2017-10-101-25/+42
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | | | | | | | | 6feb0c33 FindJava: Revise version parsing to support Java 9 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1355
| * | | FindJava: Revise version parsing to support Java 9Brad King2017-10-061-25/+42
| |/ / | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge topic 'findopenmp-fix-verbose'Brad King2017-10-061-2/+13
|\ \ \ | |/ / |/| / | |/ | | | | | | e25d88ec FindOpenMP: Fix link flags being used for compile Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1348
| * FindOpenMP: Fix link flags being used for compileChristian Pfeiffer2017-10-051-2/+13
| | | | | | | | Fixes: #17307
* | Merge topic 'cuda-default-link-launcher'Brad King2017-10-051-1/+29
|\ \ | | | | | | | | | | | | | | | | | | 7914fb82 CUDA: Fix default selection of host compiler used to drive linking Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1341
| * | CUDA: Fix default selection of host compiler used to drive linkingBrad King2017-10-041-1/+29
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | When no explicit `CMAKE_CUDA_HOST_COMPILER` is specified by the user then we do not pass `-ccbin` to `nvcc`. In this case, nvcc's link line we extract during the compiler identification step may not have the absolute path to the host compiler it uses to drive linking. If it is not absolute, use the `PATH=` from nvcc's output to search for it since that is the one `nvcc` would use. This fixes our internal `CMAKE_CUDA_HOST_LINK_LAUNCHER` value used to construct link lines when using `CUDA` as the linker language. It needs to match the host compiler `nvcc` uses internally during compilation. Fixes: #17323
* | Merge topic 'FindCUDA-run_nvcc-CMP0007'Brad King2017-10-051-5/+4
|\ \ | | | | | | | | | | | | | | | | | | 8b09c20c FindCUDA: Fix CMP0007 warning in run_nvcc.cmake Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1340
| * | FindCUDA: Fix CMP0007 warning in run_nvcc.cmakeUmar Arshad2017-10-041-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | Set `CMP0007` to `NEW` for the entire script. The script comes with CMake and is aware of the policy's behavior, so set the policy to ensure that its warnings do not show up during the build phase. Fixes: #16579