Commit Graph

32175 Commits

Author SHA1 Message Date
Kitware Robot
f0a2ec12e2 CMake Nightly Date Stamp 2022-04-07 00:01:21 -04:00
Kitware Robot
cbfc860e40 CMake Nightly Date Stamp 2022-04-06 00:01:24 -04:00
Brad King
eea53ea0a9 Merge topic 'xcode-xcconfig'
53ca6edd8a xcode: add support for xcconfig files
183b6bbf51 Tests: Ignore all classes in Xcode internal objc warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7119
2022-04-05 08:24:28 -04:00
Brad King
7e1095751f Merge topic 'cmake-gui-categories'
ebc1c60d43 cmake-gui: Add "Building" category to freedesktop menu spec

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7141
2022-04-05 08:23:22 -04:00
Kitware Robot
c2adb5bb0c CMake Nightly Date Stamp 2022-04-05 00:01:16 -04:00
Reinaldo Deprera
ebc1c60d43 cmake-gui: Add "Building" category to freedesktop menu spec
Add "Building" to Categories parameters like suggested by the
specification [1] for better XFCE/GNome/Plasma menu integration.

[1] https://specifications.freedesktop.org/menu-spec/latest/apas02.html
2022-04-04 09:55:01 -04:00
Brad King
34cb46dd6e Merge topic 'const-stack'
11cc728e75 cmConstStack: Factor out of cmListFileBacktrace
9123193758 cmListFileBacktrace: Clarify call sites that only push a file path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7135
2022-04-04 09:33:34 -04:00
Brad King
1dbd4e9a41 Merge topic 'export-out-of-dir-TARGET_NAME'
6d34cc3cb8 export: Fix TARGET_NAME lookup for out-of-dir linking

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7136
2022-04-04 09:32:52 -04:00
Kitware Robot
fd46a557c8 CMake Nightly Date Stamp 2022-04-04 00:02:47 -04:00
Gregor Jasny
53ca6edd8a xcode: add support for xcconfig files
Fixes: #18420
2022-04-03 22:39:34 +02:00
Kitware Robot
fff8f3bee9 CMake Nightly Date Stamp 2022-04-03 00:01:09 -04:00
Brad King
11cc728e75 cmConstStack: Factor out of cmListFileBacktrace
This presents value semantics for a stack of constant values.
Internally it shares ownership to avoid copies.  Previously
this was implemented by `cmListFileBacktrace` explicitly,
but the approach can be re-used for other kinds of stacks.
2022-04-02 05:55:31 -04:00
Kitware Robot
6733ad4dd5 CMake Nightly Date Stamp 2022-04-02 00:01:21 -04:00
Brad King
6d34cc3cb8 export: Fix TARGET_NAME lookup for out-of-dir linking
Improve the logic added by commit f0e67da061 (target_link_libraries: Fix
out-of-dir linking of a list of targets, 2020-01-14, v3.17.0-rc1~149^2)
to, while exporting targets, look up referenced target names in the
correct directory.
2022-04-01 13:59:51 -04:00
Brad King
9123193758 cmListFileBacktrace: Clarify call sites that only push a file path
This removes the last part of the `cmListFileBacktrace` interface
that needs to know the type of data in its stack.
2022-04-01 10:18:46 -04:00
Kitware Robot
86cee7a383 CMake Nightly Date Stamp 2022-04-01 00:01:21 -04:00
Brad King
7ae3c6740b Merge topic 'string-JSON-error-modes'
93dce4b4bf string(JSON): fix error message on invalid mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7130
2022-03-31 08:52:04 -04:00
Brad King
8ef1fffa45 Merge topic 'ninja_compile_database_understand_new_cuda_lang_variables'
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:25 -04:00
Kitware Robot
6f132d6c91 CMake Nightly Date Stamp 2022-03-31 00:01:20 -04:00
Carlo Teubner
93dce4b4bf string(JSON): fix error message on invalid mode
The `GET_ARRAY` and `MEMBERS` modes were removed during development and
review of commit 8eab76eb84 (string(JSON): Adds JSON parsing support to
the string command, 2020-08-24, v3.19.0-rc1~159^2), but were
accidentally left in an error message.
2022-03-30 15:54:11 -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
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
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
00677703d0 CMake 3.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
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
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
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
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
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
Kitware Robot
75ac22356a CMake Nightly Date Stamp 2022-03-28 00:01:21 -04:00
Kitware Robot
b8d579b4fa CMake Nightly Date Stamp 2022-03-27 00:01:09 -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
Braulio Valdivielso Martinez
fd46db1745 Trace: process else and elseif commands correctly
There have been two bugs reported about the `else` and `elseif`
commands in the context of the tracing functionality and the json-v1
format (#23191 #22315). In essence, the reported traces referred to
the layer of the stacktrace immediately on top of the expected ones.

This MR fixes both issues. My solution adds a new parameter to the
`PrintCommandTrace` function, `commandMissingFromStack`, that callers
can specify if the command they want to report a trace for is not a
regular part of the stack maintained in `cmMakefile`. This is only the
case for `else` and `elseif`. The other bug is fixed by having the
caller pass a `cmListFileBacktrace`, which helps in getting the right
lines, file names... for the reported command.

Fixes: #23191 #22315
2022-03-25 12:24:38 -04:00
moyo1997
b019ee1a8d bindexplib: Exclude entry and exit thunks for arm64EC 2022-03-25 11:00:21 -04:00
Brad King
25b9fb0b1a Merge topic 'link-interface-direct'
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
2022-03-25 09:12:39 -04:00
Brad King
96420a4afd Merge topic 'cmake-fresh'
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
2022-03-25 09:09:56 -04:00
Brad King
b11d789ef7 Merge topic 'cmake-E-tar-touch'
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
2022-03-25 09:05:41 -04:00
Craig Scott
e41f1ef6ff CPack/IFW: Add missing referenced source file validation 2022-03-25 22:53:19 +11:00
Marc Chevrier
1777883f8b genex-LINK_(LIBRARY|GROUP) features: update variables behavior
Variable CMAKE_LINK_(LIBRARY|GROUP)_USING_<FEATURE>_SUPPORTED is evaluated
only if CMAKE_<LANG>_LINK_(LIBRARY|GROUP)_USING_<FEATURE>_SUPPORTED is not defined.

This new behavior enable to activate a feature globally on a platform and to disable
it for some compilers and languages.
2022-03-25 12:29:28 +01:00
Kitware Robot
2328843450 CMake Nightly Date Stamp 2022-03-25 00:01:08 -04:00