summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'install-default-fix'Brad King2020-02-127-18/+50
|\ | | | | | | | | | | | | | | | | | | | | | | dd8d5004a9 Merge branch 'backport-3.16-install-default-fix' 45d5abf4a8 Merge branch 'backport-3.15-install-default-fix' 0a4d829c36 Merge branch 'backport-3.14-install-default-fix' b519db6217 install: Fix regression when using default destinations b4b60d1c3a install: Fix regression when using default destinations 9442ae5083 install: Fix regression when using default destinations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4340
| * Merge branch 'backport-3.16-install-default-fix'Brad King2020-02-117-18/+50
| |\
| | * Merge branch 'backport-3.15-install-default-fix'Brad King2020-02-110-0/+0
| | |\
| | | * Merge branch 'backport-3.14-install-default-fix'Brad King2020-02-110-0/+0
| | | |\
| | | | * install: Fix regression when using default destinationsKyle Edwards2020-02-117-18/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 9fc20a4f3e (install: Add sane set of defaults for DESTINATION and file type parameters, 2018-11-02, v3.14.0-rc1~410^2~1), a regression was introduced, in which an `install(TARGETS)` with a RUNTIME/LIBRARY/ARCHIVE DESTINATION but no PUBLIC_HEADER/PRIVATE_HEADER DESTINATION would then install the headers. The old behavior did not do this. Restore the old behavior. Fixes: #20326
| | | * | install: Fix regression when using default destinationsKyle Edwards2020-02-117-18/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 9fc20a4f3e (install: Add sane set of defaults for DESTINATION and file type parameters, 2018-11-02, v3.14.0-rc1~410^2~1), a regression was introduced, in which an `install(TARGETS)` with a RUNTIME/LIBRARY/ARCHIVE DESTINATION but no PUBLIC_HEADER/PRIVATE_HEADER DESTINATION would then install the headers. The old behavior did not do this. Restore the old behavior. Fixes: #20326
| | * | | install: Fix regression when using default destinationsKyle Edwards2020-02-117-18/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 9fc20a4f3e (install: Add sane set of defaults for DESTINATION and file type parameters, 2018-11-02, v3.14.0-rc1~410^2~1), a regression was introduced, in which an `install(TARGETS)` with a RUNTIME/LIBRARY/ARCHIVE DESTINATION but no PUBLIC_HEADER/PRIVATE_HEADER DESTINATION would then install the headers. The old behavior did not do this. Restore the old behavior. Fixes: #20326
* | | | | CMake Nightly Date StampKitware Robot2020-02-121-1/+1
| | | | |
* | | | | Merge branch 'release-3.16'Brad King2020-02-110-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'release-3.15' into release-3.16Brad King2020-02-110-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
* | | | | | Merge branch 'release-3.16'Brad King2020-02-110-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'backport-3.16-link-line-backtrace' into release-3.16Brad King2020-02-109-93/+85
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !4344
* | \ \ \ \ \ Merge branch 'release-3.17'Brad King2020-02-110-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge topic 'link-line-backtrace' into release-3.17Brad King2020-02-119-93/+85
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8752c1bd64 Merge branch 'backport-3.16-link-line-backtrace' e756328434 Propagate backtraces from LINK_LIBRARIES through to link line items Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: Dennis Klein <d.klein@gsi.de> Merge-request: !4344
* | \ \ \ \ \ \ \ Merge topic 'link-line-backtrace'Brad King2020-02-119-93/+85
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8752c1bd64 Merge branch 'backport-3.16-link-line-backtrace' e756328434 Propagate backtraces from LINK_LIBRARIES through to link line items Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: Dennis Klein <d.klein@gsi.de> Merge-request: !4344
| * | | | | | | | Merge branch 'backport-3.16-link-line-backtrace'Brad King2020-02-109-93/+85
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | / / / | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Propagate backtraces from LINK_LIBRARIES through to link line itemsBrad King2020-02-109-93/+85
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit d4d0dd0f6a (cmLinkLineComputer: Add ComputeLinkLibs overload with backtraces, 2019-09-13, v3.16.0-rc1~87^2~4), backtraces have been collected by `ComputeLinkLibs` by looking back through the link implementation libraries for one matching the text of the link line item. This is slow in projects with long link lines. Instead, teach `cmComputeLinkDepends` and `cmComputeLinkInformation` to carry backtrace information explicitly along with the text of each item. Fixes: #20322
* | | | | | | Merge branch 'release-3.17'Brad King2020-02-110-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | 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
* | \ \ \ \ \ \ Merge topic 'ExternalProject-submodules-recurse'Brad 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 branch 'release-3.17'Brad King2020-02-110-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | 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
* | \ \ \ \ \ \ Merge topic 'FindOpenMP-clang-windows'Brad 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 branch 'release-3.17'Brad King2020-02-110-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'FindPython-reduce-resources-comsumption' into release-3.17Brad King2020-02-112-88/+138
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3dab4682f6 FindPython: reduces consumption of resources Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4338
* | \ \ \ \ \ \ Merge topic 'FindPython-reduce-resources-comsumption'Brad King2020-02-112-88/+138
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3dab4682f6 FindPython: reduces consumption of resources Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4338
| * | | | | | | FindPython: reduces consumption of resourcesMarc Chevrier2020-02-102-88/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stores more information in the cache to reduce the number of sub-processes required on subsequent find_package calls. Fixes: #20337
* | | | | | | | Merge branch 'release-3.17'Brad King2020-02-110-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'swift-no-sdk-include' into release-3.17Brad King2020-02-117-1/+89
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c2a92f44f Swift: Exclude SDK include paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4315
* | \ \ \ \ \ \ \ Merge topic 'swift-no-sdk-include'Brad King2020-02-117-1/+89
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c2a92f44f Swift: Exclude SDK include paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4315
| * | | | | | | | Swift: Exclude SDK include pathsYauheni Khnykin2020-02-107-1/+89
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'release-3.17'Brad King2020-02-110-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | 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
* | \ \ \ \ \ \ \ Merge topic 'FindMPI-fix-rerun'Brad 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
* | | | | | | | | Merge topic 'rel-test-python'Brad King2020-02-112-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7253b49ca9 Utilities/Release: Use python 3 for tests on Windows binaries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4339
| * | | | | | | | | Utilities/Release: Use python 3 for tests on Windows binariesBrad King2020-02-102-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly specify the build machine's Python 3 installation for Windows to be used by the test suite. This avoids accidentally using other versions on the machine.
* | | | | | | | | | Merge topic 'fileapi-test-breakup'Brad King2020-02-1158-4690/+4752
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 75e71263e7 FileAPI test: Break gen_check_projects() into JSON files a0de350e2f FileAPI test: Break gen_check_targets() into JSON files de8ebc9dba FileAPI test: Break gen_check_directories() into JSON files 1605fcbbd9 FileAPI test: Add infrastructure for reading JSON test data Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4333
| * | | | | | | | | | FileAPI test: Break gen_check_projects() into JSON filesKyle Edwards2020-02-078-120/+127
| | | | | | | | | | |
| * | | | | | | | | | FileAPI test: Break gen_check_targets() into JSON filesKyle Edwards2020-02-0742-4422/+4462
| | | | | | | | | | |
| * | | | | | | | | | FileAPI test: Break gen_check_directories() into JSON filesKyle Edwards2020-02-0710-148/+157
| | | | | | | | | | |
| * | | | | | | | | | FileAPI test: Add infrastructure for reading JSON test dataKyle Edwards2020-02-071-0/+6
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2020-02-111-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'release-3.17'Brad King2020-02-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge topic 'ninja-multi-depfile' into release-3.17Brad King2020-02-106-1/+23
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 67102d3252 Ninja Multi-Config: Add support for DEPFILE option in add_custom_command() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4334
* | | | | | | | | | | Merge topic 'ninja-multi-depfile'Brad King2020-02-106-1/+23
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | / / / / / / / | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 67102d3252 Ninja Multi-Config: Add support for DEPFILE option in add_custom_command() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4334
generated by cgit v0.12 at 2025-09-11 00:34:57 (GMT)