mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-05 05:39:57 -05:00
Code Issues Packages Projects Releases Wiki Activity
65,069 Commits 2 Branches 401 Tags
0ae372daee75e6d5305ec9f934c2adce3074ca5d
Commit Graph

65069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 0ae372daee VS: Factor out common MS tool configuration 
De-duplicate code writing `PlatformToolset`.
 2024-02-19 10:40:40 -05:00
Brad King 14b0ebd4ca Merge topic 'presets-macro-expander' 
741a207717 presets: Refactor macro expander implementation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9252
 2024-02-19 09:28:27 -05:00
Brad King 09a92bebe9 Merge branch 'release-3.29' 2024-02-19 09:25:04 -05:00
Brad King 844cd3f6eb Merge branch 'release-3.28' 2024-02-19 09:25:02 -05:00
Brad King df4d6c7143 Merge branch 'release-3.28' into release-3.29 2024-02-19 09:24:49 -05:00
Brad King 00d908a01f Merge topic 'cxxmodules-nmc-duplicate-synthetic-targets' into release-3.28 
5261af9424 cmGeneratorTarget: store synthetic targets in its cache
e0633a9517 Tests/CXXModules: add a test importing from a `Ninja` install
150d7dbd68 Tests/CXXModules: support building a project with `Ninja`
e48e5e5506 Tests/CXXModules: document `CMake_TEST_MODULE_COMPILATION` items

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9263
 2024-02-19 09:23:58 -05:00
Brad King 2e5e7c465d Merge branch 'release-3.29' 2024-02-19 09:23:22 -05:00
Brad King a621340e03 Merge topic 'cxxmodules-nmc-duplicate-synthetic-targets' 
5261af9424 cmGeneratorTarget: store synthetic targets in its cache
e0633a9517 Tests/CXXModules: add a test importing from a `Ninja` install
150d7dbd68 Tests/CXXModules: support building a project with `Ninja`
e48e5e5506 Tests/CXXModules: document `CMake_TEST_MODULE_COMPILATION` items

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9263
 2024-02-19 09:23:22 -05:00
Brad King f18ba02d7e Merge topic 'cxxmodules-nmc-duplicate-synthetic-targets' into release-3.29 
5261af9424 cmGeneratorTarget: store synthetic targets in its cache
e0633a9517 Tests/CXXModules: add a test importing from a `Ninja` install
150d7dbd68 Tests/CXXModules: support building a project with `Ninja`
e48e5e5506 Tests/CXXModules: document `CMake_TEST_MODULE_COMPILATION` items

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9263
 2024-02-19 09:23:21 -05:00
Brad King cd0452f13a Merge branch 'release-3.29' 2024-02-19 09:20:35 -05:00
Brad King 44d7393177 Merge topic 'ci-wix-3.14' 
adb6af6959 ci: host WiX 3.14.0.8606 binaries ourselves
4c32b3690d ci: update to WiX 3.14.0.8606 release

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9264
 2024-02-19 09:20:35 -05:00
Brad King c5c26719c3 Merge topic 'ci-wix-3.14' into release-3.29 
adb6af6959 ci: host WiX 3.14.0.8606 binaries ourselves
4c32b3690d ci: update to WiX 3.14.0.8606 release

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9264
 2024-02-19 09:20:34 -05:00
Kitware Robot be67b4baf2 CMake Nightly Date Stamp 2024-02-19 00:02:02 -05:00
Kitware Robot e75afeae5c CMake Nightly Date Stamp 2024-02-18 00:01:11 -05:00
Kitware Robot eb7b504471 CMake Nightly Date Stamp 2024-02-17 00:01:20 -05:00
Brad King adb6af6959 ci: host WiX 3.14.0.8606 binaries ourselves 
Follow the approach from commit 9ff7fffbf4 (ci: host WiX 3.14.0.6526
binaries ourselves, 2022-08-02, v3.24.0~6^2) for the updated version.
Since we use WiX to package our official release binaries, avoid relying
on an externally-hosted package by hosting it at `cmake.org`.
 2024-02-16 13:08:23 -05:00
Ben Boeckel 5261af9424 cmGeneratorTarget: store synthetic targets in its cache 
The synthetic target cache was never actually updated, so record them in
the cache so that reuses can actually be discovered.

Fixes: #25568
 2024-02-16 11:09:56 -05:00
Ben Boeckel e0633a9517 Tests/CXXModules: add a test importing from a Ninja install 
This ensures that consuming from a single configuration generator works
in all generators.

See: #25568
 2024-02-16 11:09:56 -05:00
Ben Boeckel 150d7dbd68 Tests/CXXModules: support building a project with Ninja 
This allows testing mixed generator setups.
 2024-02-16 11:09:54 -05:00
Brad King 4c32b3690d ci: update to WiX 3.14.0.8606 release 
This official 3.14 release supports the `arm64` architecture.
Previously we used a development version for that.
 2024-02-16 10:53:03 -05:00
Ben Boeckel e48e5e5506 Tests/CXXModules: document CMake_TEST_MODULE_COMPILATION items 2024-02-16 10:28:10 -05:00
Brad King 691536a2e4 Merge branch 'release-3.29' 2024-02-16 10:08:19 -05:00
Brad King bd59b92918 Merge topic 'doc-install-relative-paths' 
af293ff7c3 Help: Explicitly discourage absolute install destinations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9261
 2024-02-16 10:08:19 -05:00
Brad King 559231aec3 Merge topic 'doc-install-relative-paths' into release-3.29 
af293ff7c3 Help: Explicitly discourage absolute install destinations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9261
 2024-02-16 10:08:18 -05:00
Brad King c404c6fa7e Merge topic 'generate-buildable-product-runnable-for-profile-action' 
021492038e Xcode: Generate BuildableProductRunnable for ProfileAction

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9155
 2024-02-16 09:54:43 -05:00
Robert Maynard af293ff7c3 Help: Explicitly discourage absolute install destinations 
Document some of the problems caused by absolute install destinations.
Encourage use of relative paths.
 2024-02-16 09:53:55 -05:00
Brad King b1126ce2d9 Merge topic 'update-kwsys' 
c845da5dfb Merge branch 'upstream-KWSys' into update-kwsys
e34aa12e66 KWSys 2024-02-15 (aad06964)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9260
 2024-02-16 09:52:28 -05:00
Brad King 11a3d4fce4 Merge topic 'update-zstd' 
9365455c78 zstd: Fix compilation with Oracle Studio compiler on Solaris
2ee2aa7074 zstd: Suppress clang-analyzer warnings
3db63973b3 Merge branch 'upstream-zstd' into update-zstd
cd0b9e547a zstd 2023-04-04 (63779c79)
fb82a882f6 zstd: Update script to get zstd 1.5.5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9253
 2024-02-16 09:51:12 -05:00
Brad King 809431e219 Merge branch 'release-3.29' 2024-02-16 09:48:47 -05:00
Brad King 146ef7aaf9 Merge topic 'ipo-ar-no-replace' 
2d72a861d7 IPO: Support duplicate object names in large archives

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9258
 2024-02-16 09:48:47 -05:00
Brad King 4398b60ac6 Merge topic 'ipo-ar-no-replace' into release-3.29 
2d72a861d7 IPO: Support duplicate object names in large archives

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9258
 2024-02-16 09:48:46 -05:00
Brad King 8513ffbe1d Merge branch 'release-3.29' 2024-02-16 09:45:06 -05:00
Brad King 35ef6acd14 Merge branch 'release-3.28' 2024-02-16 09:44:59 -05:00
Brad King b0efe5e7c5 Merge branch 'release-3.28' into release-3.29 2024-02-16 09:44:44 -05:00
Brad King 10b15c0d16 Merge branch 'release-3.29' 2024-02-16 09:41:27 -05:00
Brad King 7d1356517d Merge topic 'cxxmodules-dyndep-error-on-private-usage' 
3f8a59a05c cxxmodules: return failure from the collator when private usage is found

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9257
 2024-02-16 09:41:27 -05:00
Brad King 0e60e84d35 Merge topic 'cxxmodules-dyndep-error-on-private-usage' into release-3.29 
3f8a59a05c cxxmodules: return failure from the collator when private usage is found

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9257
 2024-02-16 09:41:20 -05:00
Brad King fb0988a276 Merge topic 'cxxmodules-dyndep-error-on-private-usage' into release-3.28 
3f8a59a05c cxxmodules: return failure from the collator when private usage is found

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9257
 2024-02-16 09:40:07 -05:00
Brad King c8f17d907a Merge branch 'release-3.29' 2024-02-16 09:32:16 -05:00
Brad King d6c81c085c Merge topic 'cxxmodules-collation-restat' 
a7424b636b Ninja: make the collator rule use `restat = 1`
e24eecfc33 Tests/CXXModules: add a test to ensure that `restat` works for collation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9259
 2024-02-16 09:32:16 -05:00
Brad King 273463aaa9 Merge topic 'cxxmodules-collation-restat' into release-3.29 
a7424b636b Ninja: make the collator rule use `restat = 1`
e24eecfc33 Tests/CXXModules: add a test to ensure that `restat` works for collation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9259
 2024-02-16 09:32:15 -05:00
Brad King d713896171 Merge topic 'cxxmodules-collation-restat' into release-3.28 
a7424b636b Ninja: make the collator rule use `restat = 1`
e24eecfc33 Tests/CXXModules: add a test to ensure that `restat` works for collation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9259
 2024-02-16 09:30:50 -05:00
Brad King 1b2cdb192d Merge branch 'release-3.29' 2024-02-16 09:26:50 -05:00
Brad King 4c4951efa8 Merge topic 'cxxmodules-visibility-change-rebuild' 
60a8736378 cmNinjaTargetGenerator: scanning depends on the module metadata
52036ce090 Tests/CXXModules: test that objects depend on dependent modules json files
9a45c9fbd5 cmNinjaTargetGenerator: use `emplace_back` for scanning deps

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9247
 2024-02-16 09:26:50 -05:00
Brad King 00fcb1dc81 Merge topic 'cxxmodules-visibility-change-rebuild' into release-3.29 
60a8736378 cmNinjaTargetGenerator: scanning depends on the module metadata
52036ce090 Tests/CXXModules: test that objects depend on dependent modules json files
9a45c9fbd5 cmNinjaTargetGenerator: use `emplace_back` for scanning deps

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9247
 2024-02-16 09:26:49 -05:00
Brad King d8fd8c2cb1 Merge topic 'cxxmodules-visibility-change-rebuild' into release-3.28 
60a8736378 cmNinjaTargetGenerator: scanning depends on the module metadata
52036ce090 Tests/CXXModules: test that objects depend on dependent modules json files
9a45c9fbd5 cmNinjaTargetGenerator: use `emplace_back` for scanning deps

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9247
 2024-02-16 09:22:32 -05:00
Brad King a843b0196e Merge branch 'release-3.29' 2024-02-16 09:20:54 -05:00
Brad King f8eaf22182 Merge topic 'cxxmodules-depend-on-modmap-file' 
363300ace5 cxxmodules: depend on the modmap contents
940628d48d Tests/CXXModules: test that objects depend on their modmap files
681ee92030 Tests/CXXModules: support testing rebuild conditions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9248
 2024-02-16 09:20:54 -05:00
Brad King 97132612f6 Merge topic 'cxxmodules-depend-on-modmap-file' into release-3.29 
363300ace5 cxxmodules: depend on the modmap contents
940628d48d Tests/CXXModules: test that objects depend on their modmap files
681ee92030 Tests/CXXModules: support testing rebuild conditions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9248
 2024-02-16 09:20:52 -05:00
Brad King 2808c49d82 Merge topic 'cxxmodules-depend-on-modmap-file' into release-3.28 
363300ace5 cxxmodules: depend on the modmap contents
940628d48d Tests/CXXModules: test that objects depend on their modmap files
681ee92030 Tests/CXXModules: support testing rebuild conditions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9248
 2024-02-16 09:20:09 -05:00