mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 22:58:37 -05:00
Code Issues Packages Projects Releases Wiki Activity
56,411 Commits 2 Branches 401 Tags
e5cda4c7725d39c0d083778e9708daf967f7824d
Commit Graph

56411 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King e5cda4c772 Merge topic 'ninja_compile_database_understand_new_cuda_lang_variables' into release-3.23 
f7c6b9833c CUDA: Ninja generator generates valid compile database

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7129
 2022-03-31 08:47:24 -04:00
Brad King cc75519e5d Merge topic 'CMakeDependentOption-doc-improvement' into release-3.23 
7a614977f9 CMakeDependentOption: improve documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Rui Oliveira <ruimail24@gmail.com>
Merge-request: !7124
 2022-03-31 08:46:28 -04:00
Ben Boeckel 7a614977f9 CMakeDependentOption: improve documentation 
This makes it far clearer that `<depends>` is a list up front instead of
burying the lede because a list is generally "trivially true" in CMake[1].
Also clarify that `<force>` is only available as a local variable and if
queried outside of the "scope" of the `cmake_dependent_option` call,
will get the stored user cache value.

[1] The exception being when the last entry ends in `-NOTFOUND`.

Suggested-by: Rui Oliveira
 2022-03-30 16:05:37 -04:00
Robert Maynard f7c6b9833c CUDA: Ninja generator generates valid compile database 
The ninja generator has been updated to poperly write the compile
database when the CUDA language has been enabled.

Fixes #23368
 2022-03-30 15:16:43 -04:00
Brad King 00677703d0 CMake 3.23.0 v3.23.0 2022-03-29 11:02:43 -04:00
Brad King 7f1573ea77 Merge topic 'cpack-ifw-validate-input' into release-3.23 
e41f1ef6ff CPack/IFW: Add missing referenced source file validation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Konstantin Podsvirov <konstantin@podsvirov.pro>
Merge-request: !7116
 2022-03-28 10:53:13 -04:00
Brad King 0ab1bbb1ec Merge topic 'doc-cpack-ifw' into release-3.23 
db774e9108 Help: Clean up and expand CPack/IFW docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7115
 2022-03-28 10:52:30 -04:00
Brad King 2dffc7c8fd Merge topic 'cpack-ifw-4.3' into release-3.23 
343ed1f913 CPack/IFW: Add support for QtIFW 4.3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7114
 2022-03-28 10:51:41 -04:00
Brad King 710c7ab647 Merge topic 'bindexplib-arm64ec' into release-3.23 
b019ee1a8d bindexplib: Exclude entry and exit thunks for arm64EC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7112
 2022-03-28 10:49:53 -04:00
Brad King 9fd1993016 Merge branch 'release-3.22' into release-3.23 2022-03-28 10:48:31 -04:00
Brad King a0149b08f0 Merge topic 'aix-exe-exports' into release-3.23 
a8dae21ac1 AIX: Fix executable ENABLE_EXPORTS in Makefile generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7120
 2022-03-28 10:47:45 -04:00
Craig Scott db774e9108 Help: Clean up and expand CPack/IFW docs 2022-03-27 16:30:45 +11:00
Brad King 345a7e3ee4 Merge branch 'release-3.21' into release-3.22 2022-03-26 08:36:34 -04:00
Brad King 0906a9b53d Merge branch 'aix-exe-exports' into release-3.22 
Merge-request: !7120
 2022-03-26 08:36:31 -04:00
Brad King 024204fe0d Merge branch 'aix-exe-exports' into release-3.21 
Merge-request: !7120
 2022-03-26 08:36:17 -04:00
Brad King a8dae21ac1 AIX: Fix executable ENABLE_EXPORTS in Makefile generators 
In commit afcd9fe669 (AIX: Add an option to disable automatic exports
from shared libraries, 2020-01-30, v3.17.0-rc1~47^2) the population of
the `<AIX_EXPORTS>` rule variable placeholder was accidentally added to
the device linking rule rather than the main linking rule.  This caused
our `ExportImportList` script on AIX, when called for executables with
`ENABLE_EXPORTS` set, to be given an `AIX_EXPORTS` file name that does
not exist, leading to a warning from the `dump` tool.

Move the population of the `<AIX_EXPORTS>` placeholder in the Makefile
generators to the main link rule.

Issue: #20290
 2022-03-26 08:28:59 -04:00
moyo1997 b019ee1a8d bindexplib: Exclude entry and exit thunks for arm64EC 2022-03-25 11:00:21 -04:00
Brad King 04e2dc9144 Merge topic 'GetPrerequisties-win-findstr' into release-3.23 
ef2fa9b03b GetPrerequisties: pass "-a" only to grep.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7110
 2022-03-25 09:45:34 -04:00
Mehdi Chinoune ef2fa9b03b GetPrerequisties: pass "-a" only to grep. 2022-03-25 09:07:44 -04:00
Craig Scott e41f1ef6ff CPack/IFW: Add missing referenced source file validation 2022-03-25 22:53:19 +11:00
Craig Scott 343ed1f913 CPack/IFW: Add support for QtIFW 4.3 2022-03-25 22:05:24 +11:00
Brad King 18b02cc127 CMake 3.23.0-rc5 v3.23.0-rc5 2022-03-23 10:11:55 -04:00
Brad King 6baef6784d Merge topic 'better_cross-ref_CMAKE_FIND_NO_INSTALL_PREFIX' into release-3.23 
7dc654a017 Help: Better cross-reference CMAKE_FIND_NO_INSTALL_PREFIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7097
 2022-03-23 09:34:41 -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
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
Robert Maynard 7dc654a017 Help: Better cross-reference CMAKE_FIND_NO_INSTALL_PREFIX 2022-03-23 16:19:03 +11: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 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 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 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 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 14849594de Merge branch 'release-3.22' into release-3.23 2022-03-22 08:46:18 -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 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 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
Ø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
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 58f15afb8a Merge branch 'release-3.22' into release-3.23 2022-03-21 14:14:30 -04:00
Brad King 0abd49ebb9 Merge branch 'release-3.21' into release-3.22 2022-03-21 14:13:56 -04:00
Brad King 2b0f96ce56 Merge branch 'rel-win-docker' into release-3.22 
Merge-request: !7087
 2022-03-21 14:13:44 -04:00
Brad King f71e89ae42 Merge branch 'rel-win-docker' into release-3.21 
Merge-request: !7087
 2022-03-21 14:13:31 -04:00
Brad King 4b89761df1 Merge topic 'rel-win-docker' into release-3.23 
a6aa88e51f Utilities/Release: Add "source" stage to Windows docker spec

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7087
 2022-03-21 14:12:37 -04:00
Brad King 687a91967f Revert INTERFACE_LINK_LIBRARIES_DIRECT feature for 3.23 branch 
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
 2022-03-21 13:17:32 -04:00
Robert Maynard 3e7113e644 FindCUDAToolkit: Add missing cufftw_static target 
Fixes #23347
 2022-03-21 09:40:17 -04:00
Craig Scott 2a8df7e7db productbuild: Don't write rootVolumeOnly attribute if writing domains 
The rootVolumeOnly attribute is deprecated. Apple docs say to use
domains instead.

Fixes: #23343
 2022-03-21 15:43:46 +11:00
Craig Scott 95eb8cbcfc CPack: Avoid space / tab mix in productbuild distribution.xml template 2022-03-21 14:31:09 +11:00
Craig Scott 28fdc3a536 productbuild: Simplify internal CPACK_PRODUCTBUILD_DOMAINS usage 
There's no benefit to storing the CPACK_PRODUCTBUILD_DOMAINS
prefix in a variable and appending to it in the C++ code. It has the
disadvantage of making it harder to find usages of the variables with
a suffix appended to that string. Expand out the strings at the places
they are used so that they are easier to spot.
 2022-03-21 13:36:48 +11:00