summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindPython-cache-cleanup' into release-3.17Brad King2020-02-271-55/+102
|\ | | | | | | | | | | | | | | 42c6a1bfee FindPython: Do not cache computed result variables a7b4516e1a FindPython: Mark non-public cache entries INTERNAL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4393
| * FindPython: Do not cache computed result variablesMarc Chevrier2020-02-261-2/+2
| | | | | | | | | | | | | | | | | | | | Since commit 06d9e67fbd (FindPython: Add capability to specify directly artifacts, 2019-08-15, v3.16.0-rc1~157^2) we accidentally add the result variables `Python*_LIBRARY_RELEASE` and `Python*_LIBRARY_DEBUG` to the cache. They are always computed from other results and so should not be presented to users in cmake-gui and ccmake to edit. Issue: #20362
| * FindPython: Mark non-public cache entries INTERNALMarc Chevrier2020-02-261-52/+99
| | | | | | | | | | | | | | | | | | Since commit 06d9e67fbd (FindPython: Add capability to specify directly artifacts, 2019-08-15, v3.16.0-rc1~157^2) we accidentally expose cache entries named `_Python...` to users in cmake-gui and ccmake. Mark those entries as `INTERNAL` to hide them. Issue: #20362
* | Merge topic 'FindCUDA-no-threads-target' into release-3.17Brad King2020-02-251-1/+5
|\ \ | | | | | | | | | | | | | | | | | | b9d67447c3 FindCUDA: Only depend on Threads::Threads on platforms that need it Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4377
| * | FindCUDA: Only depend on Threads::Threads on platforms that need itRobert Maynard2020-02-241-1/+5
| | | | | | | | | | | | | | | | | | | | | In commit 46371132b3 (FindCUDA: CUDA_LIBRARIES doesn't contain raw `-pthread`, 2019-11-11, v3.17.0-rc1~455^2) we introduced use of the `Threads::Threads` target, but we do not `find_package(Threads)` on all platforms. Use the target only if it exists.
* | | Merge topic 'FindPkgConfig-scope' into release-3.17Brad King2020-02-251-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c3e0d1ffe9 FindPkgConfig: set policies CMP0054 and CMP0057 to new Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4388
| * | | FindPkgConfig: set policies CMP0054 and CMP0057 to newRolf Eike Beer2020-02-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | One may encounter warnings if FindPkgConfig is used in any project, even indirectly, that has set any of these policies to old explicitely or requires an older version.
| * | | Merge topic 'android-ndk-r19-binutils' into release-3.16Brad King2020-02-041-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e3d3b7ddeb Android: Fix binutils selection with NDK r19+ unified toolchain Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4318
| * \ \ \ Merge topic 'aix-skip-exports' into release-3.16Brad King2020-01-311-1/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a17f6eff43 AIX: Restore pre-3.16 undocumented method to suppress exports with XL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4303
* | \ \ \ \ Merge topic 'cuda-non-device-link' into release-3.17Brad King2020-02-251-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7da2c8c543 Merge branch 'backport-cuda-non-device-link' 738f3f23aa Ninja: Do not use nvcc response files with non-nvcc tools Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !4376
| * | | | | Merge branch 'backport-cuda-non-device-link'Brad King2020-02-241-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Ninja: Do not use nvcc response files with non-nvcc toolsFrancisco Facioni2020-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit d91b5a72cd (Ninja: Add support for CUDA nvcc response files, 2019-05-30, v3.15.0-rc1~8^2) we use NVCC's `--options-file` option to avoid long link command lines via a response file. However, for non-device linking the host tools are used and the option does not make sense. Update the logic to use `--options-file` only for device linking. Linking with the host tools already has its own logic for response files. Fixes: #19954
| | * | | | Merge branch 'msvc-runtime-library-masm' into release-3.15Brad King2020-01-211-0/+6
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !4257
* | | \ \ \ \ Merge topic 'pch-create-via-include' into release-3.17Brad King2020-02-243-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c6d6ec27c PCH: Clang: Update PCH usage flags to include original header Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4360
| * | | | | | | PCH: Clang: Update PCH usage flags to include original headerSergey Larin2020-02-243-3/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an additional include flag to PCH usage command line to fix programs that rely on `compile_commands.json` file. Pass it to the preprocessor directly to avoid compiler driver to change it to '-include-pch'. When preprocessor is requested to preprocess a file, it tries to get the original filename from '.pch' and uses that file for preprocessing. CMake generates a '.pch' file from the '.hxx' file by passing an empty '.cxx' source file to the compiler as a compilation unit and the header file with the '-include' flag. After that, compiler puts compilation unit filename in the '.pch' as the original filename. However, CMake build system uses empty file as the source file and passes the header file using '-include-pch' flag. As a result, Clang uses the wrong file for preprocessing and produces the corrupted preprocessed file. Fixes: #20355 Signed-off-by: Sergey Larin <cerg2010cerg2010@mail.ru>
* | | | | | | Merge topic 'swift-exe-rpath' into release-3.17Brad King2020-02-181-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 321df5783d Swift: support `-rpath` for executables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4365
| * | | | | | | Swift: support `-rpath` for executablesSaleem Abdulrasool2020-02-171-0/+5
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | This adjusts the flags to enable setting the RPATH for executables.
* | | | | | | Merge topic 'git-config-with-spaces' into release-3.17Brad King2020-02-171-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef3194a6f8 ExternalProject: Quote each git --config option to handle spaces 40d1d29cfa Tests: Add missing ExternalProject smoke tests afc8956765 Tests: Fix test_clean target missing some test directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4364
| * | | | | | | ExternalProject: Quote each git --config option to handle spacesCraig Scott2020-02-151-1/+1
| |/ / / / / / | | | | | | | | | | | | | | Fixes: #20354
* | | | | | | Help: Replace UTF-8 apostrophe with ascii apostropheBrad King2020-02-121-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also replace UTF-8 graphical characters with simple dashes. Fixes: #20349
* | | | | | Merge topic 'doc-cpack' into release-3.17Brad King2020-02-121-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3af0b33ec6 Help: module CPack: Make internal hyperlink target more unique Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4353
| * | | | | | Help: module CPack: Make internal hyperlink target more uniqueBrad King2020-02-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We already have a `.. _targets:` in `Help/command/install.rst`.
* | | | | | | Merge topic 'doc-cpack' into release-3.17Brad King2020-02-121-10/+31
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 59e9f33d78 Help: module CPack: New section on targets. f33708eed9 Help: module CPack: add cross-reference to cpack-generators(7). 4949e1261a Help: module CPack. Explain usage of the build targets. 72eaeb41f5 Help: module CPack: correction: 2 config files are generated, not just 1 c35a9ff9c3 Help: CPack module: Correct the summary (configure, not build) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4352
| * | | | | | Help: module CPack: New section on targets.Joachim Wuttke (o)2020-02-121-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To explain in full detail to what extent the targets package and package_source are supported by different generators.
| * | | | | | Help: module CPack: add cross-reference to cpack-generators(7).Joachim Wuttke (o)2020-02-121-0/+2
| | | | | | |
| * | | | | | Help: module CPack. Explain usage of the build targets.Joachim Wuttke (o)2020-02-121-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain the usage of the two new build targets, package and package_source.
| * | | | | | Help: module CPack: correction: 2 config files are generated, not just 1Joachim Wuttke (o)2020-02-121-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Besides CPackConfig.cmake, the module also generates CPackSourceConfig.cmake.
| * | | | | | Help: CPack module: Correct the summary (configure, not build)Joachim Wuttke (o)2020-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Including CPack does not "build" installers. It just *configures* them.
* | | | | | | Merge topic 'PrintSystemInformation' into release-3.17Brad King2020-02-121-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e9328a00d Help: CMakePrintSystemInformation.cmake: Minor corrections. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4351
| * | | | | | | Help: CMakePrintSystemInformation.cmake: Minor corrections.Joachim Wuttke (o)2020-02-121-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Punctuation. "file" -> "module"
* | | | | | | Merge topic 'cpack-ifw-qt-links' into release-3.17Brad King2020-02-121-13/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e240371ab1 Help: CPackIFWGenerator: explain relation to CPackIWF 78779c6111 Help: Show external link only once per page; explain abbreviation QtIFW. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4348
| * | | | | | | Help: CPackIFWGenerator: explain relation to CPackIWFJoachim Wuttke (o)2020-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Make overview more focussed * Explain the relation to CPackIFW
| * | | | | | | Help: Show external link only once per page; explain abbreviation QtIFW.Joachim Wuttke (o)2020-02-111-13/+10
| |/ / / / / /
* | | | | | | Merge topic 'ExternalProject-submodules-recurse' into release-3.17Brad King2020-02-111-19/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0ba8010255 ExternalProject: Fix git submodule recursion on update Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4346
| * | | | | | | ExternalProject: Fix git submodule recursion on updateCharis Marangos2020-02-101-19/+28
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 5bc6230741 (ExternalProject: Option to turn off recursive update of git submodules, 2019-10-16) we implemented the feature in the clone script written by `_ep_write_gitclone_script` but not in the update script written by `_ep_write_gitupdate_script`. Implement the latter by factoring out a common helper to use in both places. Fixes: #20335
* | | | | | | Merge topic 'FindOpenMP-clang-windows' into release-3.17Brad King2020-02-111-7/+25
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ceb5ee4a7b FindOpenMP: Add support for Clang on Windows 2dbff623f9 FindOpenMP: Save flags/libs in cache entries each time they are detected Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4327
| * | | | | | | FindOpenMP: Add support for Clang on WindowsTim Hutton2020-02-101-1/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19404
| * | | | | | | FindOpenMP: Save flags/libs in cache entries each time they are detectedTim Hutton2020-02-101-6/+5
| |/ / / / / /
* | | | | | | Merge topic 'FindPython-reduce-resources-comsumption' into release-3.17Brad King2020-02-111-88/+137
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3dab4682f6 FindPython: reduces consumption of resources Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4338
| * | | | | | | FindPython: reduces consumption of resourcesMarc Chevrier2020-02-101-88/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stores more information in the cache to reduce the number of sub-processes required on subsequent find_package calls. Fixes: #20337
* | | | | | | | Merge topic 'swift-no-sdk-include' into release-3.17Brad King2020-02-113-1/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c2a92f44f Swift: Exclude SDK include paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4315
| * | | | | | | | Swift: Exclude SDK include pathsYauheni Khnykin2020-02-103-1/+8
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Populate `CMAKE_Swift_IMPLICIT_INCLUDE_DIRECTORIES` with the macOS SDK's include directory so that we filter such implicit directories out of Swift targets. Fixes: #19845
* | | | | | | | Merge topic 'FindMPI-fix-rerun' into release-3.17Brad King2020-02-111-12/+48
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b4d5ea8233 FindMPI: Preserve order of include directories on re-runs of CMake 8261ee3a9c FindMPI: Restore re-construction of include directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4341
| * | | | | | | FindMPI: Preserve order of include directories on re-runs of CMakeBrad King2020-02-101-12/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit 5861c6d450 (FindMPI: Preserve include order when extracting component directories, 2019-12-19) only works on the first run of CMake in which we find MPI. Extend the fix to save the compiler wrapper's entire include path in our cache without splitting anything out. That way we can preserve the order when CMake re-runs. Fixes: #20338
| * | | | | | | FindMPI: Restore re-construction of include directoriesBrad King2020-02-101-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit 5861c6d450 (FindMPI: Preserve include order when extracting component directories, 2019-12-19) only works on the first run of CMake in which we find MPI. It preserves the include directories on the first run but still splits them up and saves the pieces in the cache. On future runs the pieces are not re-assembled, and we do not know the order anyway. Restore the re-assembly step so that at least all the include dirs are available. Leave preservation of the original order to later work. Issue: #20338
* | | | | | | | CUDAToolkit: Add support for cupti libraryRobert Maynard2020-02-061-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20318
* | | | | | | | CUDAToolkit: Correct location of OpenCL doc linkRobert Maynard2020-02-061-2/+2
| |/ / / / / / |/| | | | | |
* | | | | | | Merge topic 'llvm-rc-preprocess'Brad King2020-02-051-0/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1c2d031cbd Add -E cmake_llvm_rc to preprocess files for llvm-rc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4219
| * | | | | | | Add -E cmake_llvm_rc to preprocess files for llvm-rcThomas Bernard2020-02-041-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | llvm-rc requires preprocessed rc files. The CMake command line tool cmake_llvm_rc enables channing the preprocessor call and the resource compiler and make this appear as single compilation step. When llvm-rc is detected as resource compiler, the RC compilation step is set to use this command.
* | | | | | | | Merge topic 'sdcc-no-default-target'Brad King2020-02-051-11/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18d2e6fc8f SDCC: Remove default flags for a specific target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4321