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

56952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King f9215a42ba Merge branch 'release-3.23' 2022-03-31 08:46:29 -04:00
Brad King 2657454b59 Merge topic 'CMakeDependentOption-doc-improvement' 
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:29 -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
Kitware Robot 6f132d6c91 CMake Nightly Date Stamp 2022-03-31 00:01:20 -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
Brad King a7b325e203 Merge topic 'verify-header-sets' 
c798744f81 FILE_SET: Add VERIFY_HEADER_SETS target property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7085
 2022-03-30 09:10:25 -04:00
Brad King 1e23384580 Merge topic 'FindHDF5-library' 
e4e309f165 FindHDF5: Add explicit library location instead of guessed library name.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !7105
 2022-03-30 09:04:26 -04:00
Brad King 3d11097ccf Merge topic 'preserve-compiler-arg1' 
211a9deac1 Preserve CMAKE_${lang}_COMPILER_ARG1 from existing CMakeCache.txt
b4de4217ae Tests: Simplify RunCMake.CompilerArgs no-clean cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7122
 2022-03-30 09:03:16 -04:00
Brad King 70ee9a313a Merge topic 'framework-consumption-during-compilation' 
45ac71d8bc Ensure targets which are frameworks can be used freely

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: alcroito <alexandru.croitor@qt.io>
Merge-request: !7121
 2022-03-30 09:02:15 -04:00
Kitware Robot c65bcea078 CMake Nightly Date Stamp 2022-03-30 00:01:17 -04:00
Kyle Edwards c798744f81 FILE_SET: Add VERIFY_HEADER_SETS target property 
Fixes: #23338
 2022-03-29 13:58:27 -04:00
Brad King f69fed2763 Merge branch 'release-3.23' 2022-03-29 12:09:48 -04:00
Brad King 00677703d0 CMake 3.23.0 v3.23.0 2022-03-29 11:02:43 -04:00
Brad King 1ccaaaf203 Merge topic 'set-env-var-first-run' 
05e510bf0b CMP0132: Don't set compiler environment variables on first run
774a9eb210 Tests: Reorder CMP0129 test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7108
 2022-03-29 10:41:56 -04:00
Klein, Thorsten (BSH) 211a9deac1 Preserve CMAKE_${lang}_COMPILER_ARG1 from existing CMakeCache.txt 
`CMAKE_<LANG>_COMPILER` may be a list if it was defined by a toolchain
file.  In this case we move the args to `CMAKE_<LANG>_COMPILER_ARG1`.
If `CMAKE_<LANG>_COMPILER` is not a list, then it might have been cached
by a previous run that split the `CC` or `CXX` environment variable into
`CMAKE_<LANG>_COMPILER` and `CMAKE_<LANG>_COMPILER_ARG1`.  In this
latter case, avoid clobbering `CMAKE_<LANG>_COMPILER_ARG1`.

Fixes: #23358
 2022-03-29 10:36:28 -04:00
Brad King b4de4217ae Tests: Simplify RunCMake.CompilerArgs no-clean cases 
Also distinguish between the toolchain and env cases in the output.
 2022-03-29 10:29:25 -04:00
Craig Scott 05e510bf0b CMP0132: Don't set compiler environment variables on first run 
When running CMake for the first time in a build tree, for some
generators CMake would set compiler environment variables
like CC, CXX, etc. when the corresponding language is enabled.
That behavior was never documented and can result in different
behavior between the first and subsequent runs. Add a policy
to no longer set those environment variables.

Fixes: #21378
 2022-03-29 09:42:59 -04:00
Brad King ce4acba7fb Merge topic 'fix-23191' 
fd46db1745 Trace: process else and elseif commands correctly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !7118
 2022-03-29 09:39:56 -04:00
Brad King ec41d23718 Merge topic 'vim-indent-close-parens' 
b14cfbe159 vim: Fix indentation of 'closing parens only lines'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7106
 2022-03-29 09:39:10 -04:00
Marc Chevrier 45ac71d8bc Ensure targets which are frameworks can be used freely 
Ensure flag -F/path/to/framework is specified during compilation step
of consumers of the framework.

Fixes: #23336
 2022-03-29 13:57:11 +02:00
Kitware Robot 2a88b807ce CMake Nightly Date Stamp 2022-03-29 00:01:23 -04:00
Brad King e3f2601a9d Merge topic 'variable-link-feature-supported' 
1777883f8b genex-LINK_(LIBRARY|GROUP) features: update variables behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7113
 2022-03-28 11:03:36 -04:00
Brad King fdbef2a2be Merge branch 'release-3.23' 2022-03-28 10:53:14 -04:00
Brad King 9f1cbddad6 Merge topic 'cpack-ifw-validate-input' 
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:14 -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 13f1c2a81a Merge branch 'release-3.23' 2022-03-28 10:52:32 -04:00
Brad King 8cf6a64a42 Merge topic 'doc-cpack-ifw' 
db774e9108 Help: Clean up and expand CPack/IFW docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7115
 2022-03-28 10:52:31 -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 793869dd2d Merge branch 'release-3.23' 2022-03-28 10:51:42 -04:00
Brad King d183d06a40 Merge topic 'cpack-ifw-4.3' 
343ed1f913 CPack/IFW: Add support for QtIFW 4.3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7114
 2022-03-28 10:51:42 -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 20562b2a02 Merge branch 'release-3.23' 2022-03-28 10:49:54 -04:00
Brad King bb58a4d7e4 Merge topic 'bindexplib-arm64ec' 
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:54 -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 15c8198aaf Merge branch 'release-3.23' 2022-03-28 10:48:53 -04:00
Brad King c955a30343 Merge branch 'release-3.22' 2022-03-28 10:48:52 -04:00
Brad King f43eba269e Merge branch 'release-3.21' 2022-03-28 10:48:50 -04:00
Brad King 9fd1993016 Merge branch 'release-3.22' into release-3.23 2022-03-28 10:48:31 -04:00
Brad King 45dbf77102 Merge branch 'release-3.23' 2022-03-28 10:47:46 -04:00
Brad King db853ac228 Merge topic 'aix-exe-exports' 
a8dae21ac1 AIX: Fix executable ENABLE_EXPORTS in Makefile generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7120
 2022-03-28 10:47:46 -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
Brad King 6861e4c338 Merge topic 'test-matlab-labels' 
9bd659ae25 Tests: Add Matlab label to Matlab-related tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7117
 2022-03-28 09:59:59 -04:00
Kitware Robot 75ac22356a CMake Nightly Date Stamp 2022-03-28 00:01:21 -04:00
Craig Scott db774e9108 Help: Clean up and expand CPack/IFW docs 2022-03-27 16:30:45 +11:00
Kitware Robot b8d579b4fa CMake Nightly Date Stamp 2022-03-27 00:01:09 -04: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
Kitware Robot 843d1d198d CMake Nightly Date Stamp 2022-03-26 00:01:25 -04:00