Commit Graph

35826 Commits

Author SHA1 Message Date
Kitware Robot
69d266e395 CMake Nightly Date Stamp 2024-07-01 00:02:20 -04:00
Kitware Robot
86e3bbfe7e CMake Nightly Date Stamp 2024-06-30 00:01:14 -04:00
Kitware Robot
af093bcc16 CMake Nightly Date Stamp 2024-06-29 00:01:13 -04:00
Kitware Robot
b72a5405a6 CMake Nightly Date Stamp 2024-06-28 00:01:15 -04:00
Brad King
9ee9571b2e Merge topic 'vs-framework-references'
0721f9bf0f VS: Add VS_FRAMEWORK_REFERENCES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9626
2024-06-27 11:22:43 -04:00
Brad King
e053d6f81b Merge topic 'orkun_26059_24_06_2024'
8d99e71b7e Autogen: Add timestamp file for CMAKE_GLOBAL_AUTORCC_TARGET
003830f14f Autogen: Remove redundant push_back

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9628
2024-06-27 11:20:49 -04:00
Kitware Robot
38884c1908 CMake Nightly Date Stamp 2024-06-27 00:01:23 -04:00
Calum Robinson
0721f9bf0f VS: Add VS_FRAMEWORK_REFERENCES
Fixes: #26082
2024-06-26 16:44:51 +01:00
Orkun Tokdemir
8d99e71b7e Autogen: Add timestamp file for CMAKE_GLOBAL_AUTORCC_TARGET
When `CMAKE_GLOBAL_AUTORCC_TARGET` is ON and qrc files are not
generated, `<target_name>_arcc_data` is always dirty. So this commit
adds a timestamp file which depens on what `<target_name>_arcc_data`
depends before and ``<target_name>_arcc_data` depends the timestamp
file.

The dependency graph before
(qrcFile, InfoFile) -> _arcc_target

The dependency graph after
(qrcFile, InfoFile) -> global_rcc_timestamp ->_arcc_target

Fixes: #26059
2024-06-26 15:37:41 +02:00
Orkun Tokdemir
003830f14f Autogen: Remove redundant push_back 2024-06-26 15:33:19 +02:00
Brad King
033713530a Merge topic 'file-rpath-elf-static'
02f3e5be6a file(RPATH_CHANGE ...): no-op for static binary
ccbbf64552 Tests/RunCMake/file-RPATH: Prepare to cover statically linked binaries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9623
2024-06-26 08:46:21 -04:00
Brad King
f879d3a33f Merge topic 'preset-comments'
7d2cc6ece6 presets: Allow comments in presets files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9608
2024-06-26 08:45:17 -04:00
Brad King
a20377e41a Merge topic 'cpack-debian-multiarch'
71c631c435 CPack/DEB: Add Multi-Arch support
55524c48a4 CPack/DEB: Add Multi-Arch support
a022705a2e Tests/RunCMake/CPack: Improve README

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9609
2024-06-26 08:44:02 -04:00
Brad King
1736e37740 Merge topic 'issue-26041-filemakedirectory-result-optional-argument'
95323c90a1 file(MAKE_DIRECTORY): Add optional RESULT keyword to capture failure.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !9604
2024-06-26 08:39:31 -04:00
Kitware Robot
812b0be621 CMake Nightly Date Stamp 2024-06-26 00:01:23 -04:00
Kitware Robot
1b8565c0b6 CMake Nightly Date Stamp 2024-06-25 00:01:16 -04:00
Aliaksandr Averchanka
7d2cc6ece6 presets: Allow comments in presets files
Co-authored-by: Kanaiym <abdigak@clarkson.edu>
Fixes: #22791
2024-06-24 15:42:46 -04:00
Harmen Stoppels
02f3e5be6a file(RPATH_CHANGE ...): no-op for static binary
Setting `CMAKE_INSTALL_RPATH` on a project that contains statically
linked executables breaks the install step, since rpaths cannot be
changed.

This commit makes rpath adjustments not an error on static libraries.

Fixes #26078
2024-06-24 11:32:30 -04:00
Brad King
4f8d39cb59 Merge topic 'vs-17.11'
dfe0f3f358 VS: Fix '-T version=14.4x' under VS 17.1x

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9622
2024-06-24 10:19:44 -04:00
Brad King
d395fb38e5 Merge topic 'apple-framework-bundle-name'
8a06f173d9 Apple: Add CFBundleName to framework Info.plist files
7c1a18655b Tests/RunCMake/Framework: Improve failure messages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jason Juang <jasjuang@gmail.com>
Merge-request: !9610
2024-06-24 09:28:44 -04:00
Brad King
4cc832f797 Merge topic 'link-feature-attributes-stabilization'
576567f028 Link feature attributes: stabilization
5617c34c31 Libraries processing: update configuration wording

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9607
2024-06-24 09:22:48 -04:00
Brad King
bf6f534451 Merge topic 'nmc-config-list'
b1a804d616 Ninja Multi-Config: Fix crash if config list is changed in subdirectory
9f8afacb3e cmGlobalNinjaGenerator: Reuse local generator caching of config list
48b911e3e5 cmGlobalNinjaGenerator: Factor out helper for global config list lookup
e2c6a54b07 cmGlobalNinjaGenerator: De-duplicate CMAKE_CONFIGURATION_TYPES lookup

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9618
2024-06-24 09:21:14 -04:00
Brad King
dfe0f3f358 VS: Fix '-T version=14.4x' under VS 17.1x
Starting with VS 17.10 the v143 toolset reserves versions `14.30`
through `14.49`.  This is the first time that the first three digits of
the version do not match the toolset name.  Extend the special case from
commit d256581bb0 (VS: Fix '-T version=14.40' under VS 17.10 preview 1,
2024-02-19, v3.29.0-rc2~10^2) to cover the entire reserved version range.
2024-06-24 08:47:33 -04:00
Kitware Robot
46d7ab203f CMake Nightly Date Stamp 2024-06-24 00:02:47 -04:00
Asit Dhal
95323c90a1 file(MAKE_DIRECTORY): Add optional RESULT keyword to capture failure.
Fixes: #26041
2024-06-24 02:20:43 +02:00
Kitware Robot
eea58be537 CMake Nightly Date Stamp 2024-06-23 00:01:11 -04:00
Kitware Robot
fd4c9a5303 CMake Nightly Date Stamp 2024-06-22 00:01:30 -04:00
Robert Schuster
55524c48a4 CPack/DEB: Add Multi-Arch support
Add support for Multi-Arch in control files of Debian packages.
Valid values: same, foreign, allowed

Fixes: #21445
2024-06-21 12:27:50 -04:00
Brad King
b1a804d616 Ninja Multi-Config: Fix crash if config list is changed in subdirectory
Look up the value of `CMAKE_CONFIGURATION_TYPES` only in the top level
directory.

Fixes: #26064
2024-06-21 12:21:36 -04:00
Brad King
9f8afacb3e cmGlobalNinjaGenerator: Reuse local generator caching of config list 2024-06-21 10:59:30 -04:00
Brad King
48b911e3e5 cmGlobalNinjaGenerator: Factor out helper for global config list lookup 2024-06-21 10:51:21 -04:00
Brad King
e2c6a54b07 cmGlobalNinjaGenerator: De-duplicate CMAKE_CONFIGURATION_TYPES lookup 2024-06-21 10:51:21 -04:00
Marc Chevrier
576567f028 Link feature attributes: stabilization
* enhance OVERRIDE handling
* Update wording
2024-06-21 11:18:20 +02:00
Marc Chevrier
5617c34c31 Libraries processing: update configuration wording 2024-06-21 11:18:12 +02:00
Kitware Robot
b83fabd0d3 CMake Nightly Date Stamp 2024-06-21 00:01:11 -04:00
Brad King
8a06f173d9 Apple: Add CFBundleName to framework Info.plist files
Fixes: #26046
2024-06-20 10:33:07 -04:00
Kitware Robot
90caa3880f CMake Nightly Date Stamp 2024-06-20 00:01:14 -04:00
Kitware Robot
3e83c34697 CMake Nightly Date Stamp 2024-06-19 00:01:20 -04:00
Kitware Robot
9c56c46ed4 CMake Nightly Date Stamp 2024-06-18 00:01:14 -04:00
Brad King
cdc901797a CMake 3.29.6 2024-06-17 14:49:43 -04:00
Kitware Robot
33b0acd8b7 CMake Nightly Date Stamp 2024-06-17 00:03:50 -04:00
Kitware Robot
81512a1b7e CMake Nightly Date Stamp 2024-06-16 00:01:32 -04:00
Kitware Robot
68124fbc75 CMake Nightly Date Stamp 2024-06-15 00:01:36 -04:00
Brad King
456ad1e7c0 CMake 3.30.0-rc3 2024-06-14 09:32:58 -04:00
Brad King
a66dfe22d7 Merge topic 'ctest-windows-std-handles'
e4d0169107 ctest: Fix spurious build failures with CTEST_USE_LAUNCHERS on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9598
2024-06-14 09:27:06 -04:00
Brad King
224e7b922f Merge topic 'ctest-windows-std-handles' into release-3.30
e4d0169107 ctest: Fix spurious build failures with CTEST_USE_LAUNCHERS on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9598
2024-06-14 09:27:04 -04:00
Brad King
4d5ac1e94e Merge topic 'vs-quote-semicolons'
9b672e8075 VS: Quote custom command arguments containing semicolons

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9597
2024-06-14 09:24:32 -04:00
Brad King
c10ac9e86c Merge topic 'vs-quote-semicolons' into release-3.30
9b672e8075 VS: Quote custom command arguments containing semicolons

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9597
2024-06-14 09:24:31 -04:00
Brad King
9b672e8075 VS: Quote custom command arguments containing semicolons
The `GoogleTest` module needs this to pass the `TEST_EXECUTOR`
definition to its `GoogleTestAddTests.cmake` helper script in
the `POST_BUILD` command since commit f875c479f5 (GoogleTest: Honor
TEST_LAUNCHER in gtest_discover_tests, 2024-01-17, v3.29.0-rc1~34^2).
Previously it worked only if other characters, such as spaces,
caused the argument to be quoted.  This was exposed by running the
`RunCMake.GoogleTest` test in a path without spaces.

Reported-by: Garrett Campbell <gcampbell@microsoft.com>
2024-06-14 08:24:21 -04:00
Brad King
e4d0169107 ctest: Fix spurious build failures with CTEST_USE_LAUNCHERS on Windows
Remove the stdio handle inheritance suppression originally added by
commit f262298bb0 (... do not inherit pipes in child procs for ctest so
it can kill them, 2007-09-11, v2.6.0~1136).  It's not clear what problem
it was trying to solve, was only done in `ctest` and not `cmake`, and
since commit 9c3ffe2474 (BUG: fix problem with stdout and stderr not
showing up in ms dos shells, 2007-09-25, v2.6.0~1066) has not been done
in `ctest` launched under interactive consoles.

Furthermore, the code has been spuriously breaking stdio when `ctest` is
started with both stdout and stderr connected to the same pipe, such as
when `ctest --launch` is used under `ninja`.  This is because it used
`DuplicateHandle` with `DUPLICATE_CLOSE_SOURCE` on the stdout handle and
then the stderr handle.  If the handles are the same, then the stderr
handle becomes invalid in between these operations, leading to
likely-undefined behavior.  Since commit 96b3dd329e
(cmCTestLaunchReporter: Replace cmsysProcess with cmUVProcessChain,
2023-07-26, v3.28.0-rc1~138^2~2) this became more noticeable because
`uv_spawn` performs additional verification on stdio handles.

This could be fixed by instead suppressing inheritance via

    SetHandleInformation(h, HANDLE_FLAG_INHERIT, 0);

However, the functionality no longer seems necessary, so remove it.
2024-06-14 07:32:29 -04:00