summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-3.23'Brad King2022-03-250-0/+0
|\
| * Merge topic 'GetPrerequisties-win-findstr' into release-3.23Brad King2022-03-251-1/+3
| |\ | | | | | | | | | | | | | | | | | | ef2fa9b03b GetPrerequisties: pass "-a" only to grep. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7110
* | \ Merge topic 'GetPrerequisties-win-findstr'Brad King2022-03-251-1/+3
|\ \ \ | | |/ | |/| | | | | | | | | | | | | ef2fa9b03b GetPrerequisties: pass "-a" only to grep. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7110
| * | GetPrerequisties: pass "-a" only to grep.Mehdi Chinoune2022-03-251-1/+3
| |/
* | Merge topic 'link-interface-direct'Brad King2022-03-2523-73/+253
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | cf312a2e54 LINK_LIBRARIES: Add support for LINK_ONLY genex 41a6b4a53b INTERFACE_LINK_LIBRARIES_DIRECT: Honor link dependencies through LINK_ONLY 73337cb383 LINK_LIBRARIES: Evaluate separately for linking and usage requirements Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7107
| * | LINK_LIBRARIES: Add support for LINK_ONLY genexBrad King2022-03-2410-8/+99
| | | | | | | | | | | | | | | | | | | | | Previously we always used content guarded by `$<LINK_ONLY:...>` in `LINK_LIBRARIES`, even when evaluating for non-linking usage requirements. Add a policy to honor `LINK_ONLY` in `LINK_LIBRARIES` the same way we already do in `INTERFACE_LINK_LIBRARIES`.
| * | INTERFACE_LINK_LIBRARIES_DIRECT: Honor link dependencies through LINK_ONLYBrad King2022-03-225-23/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit f3ad061858 (Add usage requirements to update direct link dependencies, 2022-01-12, v3.23.0-rc1~44^2), we evaluated the transitive closure of `INTERFACE_LINK_LIBRARIES` as a non-linking usage requirement. That left out `INTERFACE_LINK_LIBRARIES_DIRECT` link dependencies that appear behind private dependencies of a static library, guarded by the `$<LINK_ONLY:...>` generator expression. At the time, that decision was intentional, in order to prevent arbitrary usage requirements from leaking out of `PRIVATE` dependencies. Since then, we've revised evaluation of `LINK_LIBRARIES` to distinguish between collecting link dependencies and other usage requirements. Use that information when following `INTERFACE_LINK_LIBRARIES` to collect the matching kind of requirements from `INTERFACE_LINK_LIBRARIES_DIRECT`. Fixes: #22496
| * | LINK_LIBRARIES: Evaluate separately for linking and usage requirementsBrad King2022-03-2210-43/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We evaluate `LINK_LIBRARIES` and `INTERFACE_LINK_LIBRARIES` for two purposes: * Constructing the link line. * Collecting usage requirements. We evaluate `INTERFACE_LINK_LIBRARIES` separately for each purpose in order to support the `$<LINK_ONLY:...>` generator expression used to express private link dependencies of a static library. Previously we only evaluated `LINK_LIBRARIES` for linking, and used that result for collecting usage requirements too. Therefore `$<LINK_ONLY:...>` does not work in `LINK_LIBRARIES`. With the introduction of `INTERFACE_LINK_LIBRARIES_DIRECT`, evaluation of `LINK_LIBRARIES` now needs to distinguish these two cases in order to honor link dependencies encountered through `$<LINK_ONLY:...>` without also exposing other usage requirements through private dependencies of a static library. Revise internal infrastructure to distinguish the two cases when evaluating `LINK_LIBRARIES`. Make the information available in code paths for `INTERFACE_LINK_LIBRARIES_DIRECT` and `LINK_ONLY`. Defer actually using the information to later commits. Issue: #22496
* | | Merge topic 'cmake-fresh'Brad King2022-03-2513-3/+74
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9f1471739d cmake: Add --fresh option to clear the cache and start from scratch Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !7099
| * | | cmake: Add --fresh option to clear the cache and start from scratchBrad King2022-03-2213-3/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify the workflow to re-run CMake from scratch as if a build tree were never before processed, regardless of whether it has been. Fixes: #23119
* | | | Merge topic 'cmake-E-tar-touch'Brad King2022-03-2511-12/+92
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b7fd783f8 cmake -E tar: Add --touch option f692cba34b Tests: Add test for 'cmake -E tar --mtime' option Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7061
| * | | | cmake -E tar: Add --touch optionKasper Laudrup2022-03-239-12/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to GNU tar add a --touch option to the tar extract command to skip extracting the timestamps from the files in the archive effectively touching them as if they were just created. Issue: #22746
| * | | | Tests: Add test for 'cmake -E tar --mtime' optionKasper Laudrup2022-03-233-0/+23
| | | | | | | | | | | | | | | | | | | | Add a test for ensuring the `--mtime` option works as expected.
* | | | | CMake Nightly Date StampKitware Robot2022-03-251-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2022-03-241-1/+1
| | | | |
* | | | | Merge branch 'release-3.23'Brad King2022-03-230-0/+0
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | CMake 3.23.0-rc5v3.23.0-rc5Brad King2022-03-231-1/+1
| | | |
* | | | Merge branch 'release-3.23'Brad King2022-03-230-0/+0
|\ \ \ \ | |/ / /
| * | | Merge topic 'better_cross-ref_CMAKE_FIND_NO_INSTALL_PREFIX' into release-3.23Brad King2022-03-232-2/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7dc654a017 Help: Better cross-reference CMAKE_FIND_NO_INSTALL_PREFIX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7097
* | \ \ \ Merge topic 'better_cross-ref_CMAKE_FIND_NO_INSTALL_PREFIX'Brad King2022-03-232-2/+5
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 7dc654a017 Help: Better cross-reference CMAKE_FIND_NO_INSTALL_PREFIX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7097
| * | | | Help: Better cross-reference CMAKE_FIND_NO_INSTALL_PREFIXRobert Maynard2022-03-232-2/+5
| | | | |
* | | | | Merge branch 'release-3.23'Brad King2022-03-230-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'initialize-property-name' into release-3.23Brad King2022-03-2313-29/+31
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 26caa97057 define_property(): Change constraints of INITIALIZE_FROM_VARIABLE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7103
* | | | | Merge topic 'initialize-property-name'Brad King2022-03-2313-29/+31
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 26caa97057 define_property(): Change constraints of INITIALIZE_FROM_VARIABLE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7103
| * | | | define_property(): Change constraints of INITIALIZE_FROM_VARIABLEKyle Edwards2022-03-2313-29/+31
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Remove the requirement that the variable name have a prefix while keeping the suffix requirement. Require that the property name contains an underscore. Update docs and tests accordingly. Fixes: #23340
* | | | Merge topic 'LINK_GROUP-feat-RESCAN-on-BSD-systems'Brad King2022-03-235-7/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d658332782 Genex-LINK_GROUP: Add support feature RESCAN on BSD systems Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7104
| * | | | Genex-LINK_GROUP: Add support feature RESCAN on BSD systemsMarc Chevrier2022-03-225-7/+22
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2022-03-231-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'release-3.23'Brad King2022-03-220-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'revert-link-interface-direct-for-3.23' into release-3.23Brad King2022-03-2278-1320/+27
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 687a91967f Revert INTERFACE_LINK_LIBRARIES_DIRECT feature for 3.23 branch Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7098
* | \ \ \ Merge topic 'revert-link-interface-direct-for-3.23'Brad King2022-03-224-7/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 75c701f66f Help: Update INTERFACE_LINK_LIBRARIES_DIRECT to be added in 3.24 0a35b70c24 Merge branch 'revert-link-interface-direct-for-3.23' 687a91967f Revert INTERFACE_LINK_LIBRARIES_DIRECT feature for 3.23 branch Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7098
| * | | | | Help: Update INTERFACE_LINK_LIBRARIES_DIRECT to be added in 3.24Brad King2022-03-223-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This feature has been reverted from the 3.23 release branch. Update its documentation and release note to target 3.24 instead. Issue: #22496
| * | | | | Merge branch 'revert-link-interface-direct-for-3.23'Brad King2022-03-221-5/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the "ours" merge strategy because we only want to revert the change from the 3.23 branch, not from `master`. It will be revised for inclusion in a future release series. Manually remove the 3.23 release note that would have been removed by this merge without the "ours" strategy.
| | * | | | Revert INTERFACE_LINK_LIBRARIES_DIRECT feature for 3.23 branchBrad King2022-03-2178-1320/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit f3ad061858 (Add usage requirements to update direct link dependencies, 2022-01-12, v3.23.0-rc1~44^2) and the property storage updates in its predecessor commit 193a999cd5 (cmTarget: Add INTERFACE_LINK_LIBRARIES_DIRECT{,_EXCLUDE} backtrace storage, 2022-01-06, v3.23.0-rc1~44^2~1) from the 3.23 release branch. After initial experience using the feature in practice, additional design considerations have been raised for discussion in the original issue. To avoid rushing this for the 3.23 series, we've decided to revert the feature for now so it can be revised for a future release. Issue: #22496
* | | | | | Merge topic 'ci-openjdk'Brad King2022-03-224-8/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97f4aa1f05 ci: Add OpenJDK to Debian and Fedora base images 78d0613695 ci: Drop p4 binary checksum because the download URL is not stable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7102
| * | | | | | ci: Add OpenJDK to Debian and Fedora base imagesBrad King2022-03-214-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables the `JavaExportImport` test in CI.
| * | | | | | ci: Drop p4 binary checksum because the download URL is not stableBrad King2022-03-182-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit f9526f39a1 (ci: Add bzr and p4 to Debian and Fedora base images, 2022-02-21) we checked the SHA-256 hash of the Perforce binary. However, content at the download URL has changed in just the last few weeks, so we cannot consider it stable.
* | | | | | | Merge topic 'FindMatlab-batch'Brad King2022-03-222-8/+60
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8468dfb35f FindMatlab: Use -batch option in matlab_add_unit_test if possible ebb0685824 FindMatlab: Add fallback to use -batch option in version extraction Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7088
| * | | | | | | FindMatlab: Use -batch option in matlab_add_unit_test if possibleSilvio Traversaro2022-03-212-1/+13
| | | | | | | |
| * | | | | | | FindMatlab: Add fallback to use -batch option in version extractionSilvio2022-03-181-7/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #22646
* | | | | | | | Merge topic 'cuda-nvcc-error-msg-on-detection-failure'Brad King2022-03-221-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4040173ed3 CUDA: Generate better error message when detecting nvcc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7094
| * | | | | | | | CUDA: Generate better error message when detecting nvccRobert Maynard2022-03-211-4/+4
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Issue: #23322, #23323
* | | | | | | | Merge topic 'emacs-indent-close-parens'Brad King2022-03-221-17/+39
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bc690f89f5 cmake-mode.el: Fix indentation of 'closing parens only lines' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7089
| * | | | | | | | cmake-mode.el: Fix indentation of 'closing parens only lines'Kai Tetzlaff2022-03-181-17/+39
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Outdent lines containing only closing parentheses (`)`) by `cmake-tab-width` to align the indentation of the 'closing parens only line' with the line that contains the opening paren. I.e. change the formatting from: add_library(mylib mysrc.c ) to: add_library(mylib mysrc.c )
* | | | | | | | Merge branch 'release-3.23'Brad King2022-03-220-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge topic 'tutorial-license-name' into release-3.23Brad King2022-03-221-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6892002fcb Tutorial: Fix casing of reference to License.txt Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7100
* | \ \ \ \ \ \ \ Merge topic 'tutorial-license-name'Brad King2022-03-221-1/+1
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6892002fcb Tutorial: Fix casing of reference to License.txt Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7100
| * | | | | | | | Tutorial: Fix casing of reference to License.txtØystein Sørensen2022-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct a tiny typo in the Step 7 tutorial. Change so `License.txt` correctly starts with a capital `L`.
* | | | | | | | | Merge branch 'release-3.23'Brad King2022-03-220-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'cleanup-define_property' into release-3.23Brad King2022-03-222-24/+28
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 87c3b5e421 define_property(): Only test prefix if INITIALIZE_FROM_VARIABLE is given 9b50f221f6 Help: Update the main purpose of define_property() e993e2c52c Help: Clean up INITIALIZE_FROM_VARIABLE define_property() option Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !7090