mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-07 07:39:32 -06:00
Code Issues Packages Projects Releases Wiki Activity
56,872 Commits 2 Branches 390 Tags
488fcb22da4590226fa154cbdfcdf30b2817c45d
Commit Graph

56872 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
488fcb22da Merge branch 'release-3.23' 2022-03-23 09:32:11 -04:00
Brad King
00563063c0 Merge topic 'initialize-property-name' 
26caa97057 define_property(): Change constraints of INITIALIZE_FROM_VARIABLE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7103
 2022-03-23 09:32:11 -04:00
Brad King
3b1efedc40 Merge topic 'initialize-property-name' into release-3.23 
26caa97057 define_property(): Change constraints of INITIALIZE_FROM_VARIABLE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7103
 2022-03-23 09:32:10 -04:00
Brad King
c4d16c4964 Merge topic 'LINK_GROUP-feat-RESCAN-on-BSD-systems' 
d658332782 Genex-LINK_GROUP: Add support feature RESCAN on BSD systems

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7104
 2022-03-23 09:30:29 -04:00
Kyle Edwards
26caa97057 define_property(): Change constraints of INITIALIZE_FROM_VARIABLE 
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
 2022-03-23 16:39:32 +11:00
Kitware Robot
7936fc65dc CMake Nightly Date Stamp 2022-03-23 00:01:46 -04:00
Brad King
c173b1009a Merge branch 'release-3.23' 2022-03-22 11:56:44 -04:00
Brad King
6ab75f4c44 Merge topic 'revert-link-interface-direct-for-3.23' 
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
 2022-03-22 11:56:44 -04:00
Brad King
2aad4cef97 Merge topic 'revert-link-interface-direct-for-3.23' into release-3.23 
687a91967f Revert INTERFACE_LINK_LIBRARIES_DIRECT feature for 3.23 branch

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7098
 2022-03-22 11:56:43 -04:00
Brad King
75c701f66f Help: Update INTERFACE_LINK_LIBRARIES_DIRECT to be added in 3.24 
This feature has been reverted from the 3.23 release branch.
Update its documentation and release note to target 3.24 instead.

Issue: #22496
 2022-03-22 09:14:55 -04:00
Brad King
0a35b70c24 Merge branch 'revert-link-interface-direct-for-3.23' 
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.
 2022-03-22 09:13:43 -04:00
Brad King
b5b4ae17dc Merge topic 'ci-openjdk' 
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
 2022-03-22 09:01:22 -04:00
Brad King
621120e87c Merge topic 'FindMatlab-batch' 
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
 2022-03-22 09:00:16 -04:00
Brad King
c494803778 Merge topic 'cuda-nvcc-error-msg-on-detection-failure' 
4040173ed3 CUDA: Generate better error message when detecting nvcc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7094
 2022-03-22 08:59:26 -04:00
Brad King
e6e411f114 Merge topic 'emacs-indent-close-parens' 
bc690f89f5 cmake-mode.el: Fix indentation of 'closing parens only lines'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7089
 2022-03-22 08:58:12 -04:00
Brad King
9bb771ef1b Merge branch 'release-3.23' 2022-03-22 08:56:17 -04:00
Brad King
33bb2d9b18 Merge topic 'tutorial-license-name' 
6892002fcb Tutorial: Fix casing of reference to License.txt

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7100
 2022-03-22 08:56:16 -04:00
Brad King
25c31f1955 Merge topic 'tutorial-license-name' into release-3.23 
6892002fcb Tutorial: Fix casing of reference to License.txt

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7100
 2022-03-22 08:56:15 -04:00
Brad King
e13591c846 Merge branch 'release-3.23' 2022-03-22 08:55:15 -04:00
Brad King
bbfc6215aa Merge topic 'cleanup-define_property' 
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
 2022-03-22 08:55:15 -04:00
Brad King
2f3cf60711 Merge topic 'cleanup-define_property' into release-3.23 
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
 2022-03-22 08:55:14 -04:00
Brad King
cc89ae3225 Merge branch 'release-3.23' 2022-03-22 08:52:12 -04:00
Brad King
67ce80ac71 Merge topic 'doc-test-property-genex' 
78e0204e81 Help: Clarify when add_test and test properties support generator expressions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7101
 2022-03-22 08:52:12 -04:00
Brad King
c216a5a716 Merge topic 'doc-test-property-genex' into release-3.23 
78e0204e81 Help: Clarify when add_test and test properties support generator expressions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7101
 2022-03-22 08:52:11 -04:00
Brad King
c5dc55663c Merge branch 'release-3.23' 2022-03-22 08:51:02 -04:00
Brad King
a20424e737 Merge topic 'productbuild-rootVolumeOnly' 
2a8df7e7db productbuild: Don't write rootVolumeOnly attribute if writing domains
95eb8cbcfc CPack: Avoid space / tab mix in productbuild distribution.xml template
28fdc3a536 productbuild: Simplify internal CPACK_PRODUCTBUILD_DOMAINS usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7092
 2022-03-22 08:51:02 -04:00
Brad King
73939fb3cb Merge topic 'productbuild-rootVolumeOnly' into release-3.23 
2a8df7e7db productbuild: Don't write rootVolumeOnly attribute if writing domains
95eb8cbcfc CPack: Avoid space / tab mix in productbuild distribution.xml template
28fdc3a536 productbuild: Simplify internal CPACK_PRODUCTBUILD_DOMAINS usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7092
 2022-03-22 08:51:01 -04:00
Brad King
b0b536a255 Merge branch 'release-3.23' 2022-03-22 08:46:29 -04:00
Brad King
6a94f915de Merge branch 'release-3.22' 2022-03-22 08:46:27 -04:00
Brad King
14849594de Merge branch 'release-3.22' into release-3.23 2022-03-22 08:46:18 -04:00
Brad King
09ad20481f Merge branch 'release-3.23' 2022-03-22 08:45:04 -04:00
Brad King
c295f4a77e Merge topic 'cpack-nsis-fix-uninstall-quoting' 
5d2ceaada8 CPack/NSIS: Add support for unquoted (legacy) uninstaller strings
b795c96727 CPack/NSIS: Fix uninstall command when run from installer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7096
 2022-03-22 08:45:04 -04:00
Brad King
21fa99320f Merge topic 'cpack-nsis-fix-uninstall-quoting' into release-3.23 
5d2ceaada8 CPack/NSIS: Add support for unquoted (legacy) uninstaller strings
b795c96727 CPack/NSIS: Fix uninstall command when run from installer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7096
 2022-03-22 08:45:03 -04:00
Brad King
22250fd59a Merge branch 'release-3.23' 2022-03-22 08:43:30 -04:00
Brad King
575c87c359 Merge topic 'FindCUDAToolkit-cufftw-static' into release-3.23 
3e7113e644 FindCUDAToolkit: Add missing cufftw_static target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7093
 2022-03-22 08:43:29 -04:00
Brad King
fd467241a4 Merge topic 'FindCUDAToolkit-cufftw-static' 
3e7113e644 FindCUDAToolkit: Add missing cufftw_static target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7093
 2022-03-22 08:43:29 -04:00
Brad King
2bdb8f08a4 Merge branch 'release-3.23' 2022-03-22 08:42:20 -04:00
Brad King
7e36fcd745 Merge topic 'doc-productbuild' 
bf44efadab Help: Add more detail for CPACK_PRODUCTBUILD_DOMAINS* variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7091
 2022-03-22 08:42:20 -04:00
Brad King
5e8aa0d3fb Merge topic 'doc-productbuild' into release-3.23 
bf44efadab Help: Add more detail for CPACK_PRODUCTBUILD_DOMAINS* variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7091
 2022-03-22 08:42:19 -04:00
Marc Chevrier
d658332782 Genex-LINK_GROUP: Add support feature RESCAN on BSD systems 2022-03-22 11:36:10 +01:00
Kitware Robot
e4039a8e34 CMake Nightly Date Stamp 2022-03-22 00:01:18 -04:00
Brad King
97f4aa1f05 ci: Add OpenJDK to Debian and Fedora base images 
This enables the `JavaExportImport` test in CI.
 2022-03-21 16:30:58 -04:00
Øystein Sørensen
6892002fcb Tutorial: Fix casing of reference to License.txt 
Correct a tiny typo in the Step 7 tutorial.  Change so `License.txt`
correctly starts with a capital `L`.
 2022-03-21 15:58:26 -04:00
Brad King
78e0204e81 Help: Clarify when add_test and test properties support generator expressions 
Issue: #23329
 2022-03-21 15:46:50 -04:00
Robert Maynard
4040173ed3 CUDA: Generate better error message when detecting nvcc 
Issue: #23322, #23323
 2022-03-21 15:18:22 -04:00
Silvio Traversaro
8468dfb35f FindMatlab: Use -batch option in matlab_add_unit_test if possible 2022-03-21 14:58:24 -04:00
Brad King
01a4be3c60 Merge branch 'cpack-nsis-fix-uninstall-quoting' into release-3.22 
Merge-request: !7096
 2022-03-21 14:54:53 -04:00
Marc Jeanmougin
5d2ceaada8 CPack/NSIS: Add support for unquoted (legacy) uninstaller strings 2022-03-21 14:53:44 -04:00
Marc Jeanmougin
b795c96727 CPack/NSIS: Fix uninstall command when run from installer 
The quoting introduced by commit eb3b3bacdc (CPack/NSIS: Fix uninstall
on Windows using "Apps & Features", 2021-09-13, v3.22.0-rc1~136^2)
created two errors in the uninstaller call: double quoting of the
uninstaller executable, and quotes added to the `_?=` argument which
does not support them.  Simplify the command.
 2022-03-21 14:53:31 -04:00
Brad King
7e642a6fa0 Merge topic 'ghs_predefined_targets' 
399e73b89a GHS: release note
829e946c69 GHS: Update tests for updated binary layout
93c1acd8ff GHS: List predefined targets before user targets in GUI
bdb213819c GHS: Do not include WindowsPaths
b3e9c72901 GHS: use INSTALL target
a645287784 GHS: update build command
724b5491ef GHS: Rearrange project files in binary directory
edff0f6a1d GHS: Use Custom Target for ALL_BUILD
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7079
 2022-03-21 14:36:42 -04:00