mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-13 01:29:02 -05:00
Code Issues Packages Projects Releases Wiki Activity
64,418 Commits 2 Branches 401 Tags
7c39dabdbc505587f91ae41b4fd7c287d41443e5
Commit Graph

64418 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Orkun Tokdemir 7c39dabdbc Autogen: AUTO*_EXECUTABLE: add support for per-config values 
* Per-config values were added to `AUTO*_EXECUTABLE`.
* Dependency order was refactored for `cmake_autogen` and `cmake_autorcc` to avoid unnecessary rebuilds.
* A new parameter was added for `cmake_autogen` and `cmake_autorcc` to specify the config name of the `auto*_executable` to be used.
* Add `AUTOGEN_BETTER_GRAPH_MULTI_CONFIG` target property to change the behavior of the dependency graph.
* The timestamp target is split into three targets for per-config to avoid redundant `mocs_compilation` builds when `AUTOGEN_BETTER_GRAPH_MULTI_CONFIG`	 is ON
* Per-config `DEP_FILE_RULE_NAME` values were added to `AutogenInfo.json` for `Multi-Config` usage.
* Some functions were refactored to avoid code duplication.

This commit reimplements fddd0f0443

Fixes: #20074
 2024-01-17 16:02:58 +01:00
Kitware Robot 31dead97ed CMake Nightly Date Stamp 2024-01-04 00:01:11 -05:00
Brad King 9090d340b4 Merge branch 'release-3.28' 2024-01-03 13:53:05 -05:00
Brad King 040ee747c3 Merge topic 'cxxmodules-no-compile-commands-modmap' 
eebf239d9c Merge branch 'cxxmodules-no-compile-commands-modmap-release' into cxxmodules-no-compile-commands-modmap
73fbad3d93 cmNinjaTargetGenerator: use scan flag for modmap usage in exported commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9100
 2024-01-03 13:53:05 -05:00
Brad King a0a5a5b85a Merge topic 'cxxmodules-no-compile-commands-modmap' into release-3.28 
73fbad3d93 cmNinjaTargetGenerator: use scan flag for modmap usage in exported commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9100
 2024-01-03 13:53:04 -05:00
Craig Scott c51953981c Merge branch 'release-3.28' 2024-01-03 07:19:09 -05:00
Craig Scott 4a76154e05 Merge topic 'cxxmodules-error-message-improvement' 
4962eba981 cmDyndepCollation: clarify CXX_MODULES-without-BMI error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Yaraslau <yaraslau.tamashevich@gmail.com>
Merge-request: !9103
 2024-01-03 07:19:09 -05:00
Craig Scott cc3c630daf Merge topic 'cxxmodules-error-message-improvement' into release-3.28 
4962eba981 cmDyndepCollation: clarify CXX_MODULES-without-BMI error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Yaraslau <yaraslau.tamashevich@gmail.com>
Merge-request: !9103
 2024-01-03 07:19:08 -05:00
Craig Scott 9001377cf8 Merge topic 'tests-quote-possibly-empty-arg' 
d0f395525f Tests: Quote possibly empty string(REPLACE) argument

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9116
 2024-01-03 07:07:03 -05:00
Kitware Robot 63cd112063 CMake Nightly Date Stamp 2024-01-03 00:01:06 -05:00
Craig Scott 275b2cc12f Merge branch 'release-3.28' 2024-01-02 06:01:00 -05:00
Craig Scott 688eae3625 Merge topic 'doc-dynamic-resource-spec-file' 
9b63f92f27 Help: Update missed text for dynamically generated resource spec files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9117
 2024-01-02 06:01:00 -05:00
Craig Scott fba975dead Merge topic 'doc-dynamic-resource-spec-file' into release-3.28 
9b63f92f27 Help: Update missed text for dynamically generated resource spec files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9117
 2024-01-02 06:00:59 -05:00
Kitware Robot 9841c4d879 CMake Nightly Date Stamp 2024-01-02 00:01:06 -05:00
Craig Scott 9b63f92f27 Help: Update missed text for dynamically generated resource spec files 2024-01-01 17:37:14 +11:00
Kitware Robot bd20084b6a CMake Nightly Date Stamp 2024-01-01 00:01:33 -05:00
Craig Scott 877b65aa6f Merge branch 'release-3.28' 2023-12-31 19:59:11 -05:00
Craig Scott 4253a41a67 Merge topic 'fix-redirect-links' 
5a7927d028 Help: update lua.org links to be HTTPS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9114
 2023-12-31 19:59:11 -05:00
Craig Scott d12c9d62f4 Merge topic 'fix-redirect-links' into release-3.28 
5a7927d028 Help: update lua.org links to be HTTPS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9114
 2023-12-31 19:59:10 -05:00
Craig Scott d0f395525f Tests: Quote possibly empty string(REPLACE) argument 
The ${unity_source_line} variable should not normally be empty,
but it has been observed that it sometimes is due to other factors.
Rather than causing string(REPLACE) to fail due to the wrong
number of arguments, quote the variable so that the
UnityBuildPre2017 test case fails with a more appropriate
error in the block just after the usage fixed by this change.
 2024-01-01 11:58:22 +11:00
Ben Boeckel 5a7927d028 Help: update lua.org links to be HTTPS 
This is now a permanent redirect, so update links accordingly.
 2024-01-01 11:32:32 +11:00
Craig Scott 5a4d7c254f Merge branch 'release-3.28' 2023-12-31 19:29:44 -05:00
Craig Scott 581c2b6240 Merge topic 'doc-toolchains-apple' 
315cf74025 Help: Note CMAKE_IOS_INSTALL_COMBINED deprecation in toolchains example
af2e4379fc Help: Fix typo not accounting for addition of visionOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9112
 2023-12-31 19:29:44 -05:00
Craig Scott ea58c2630f Merge topic 'doc-toolchains-apple' into release-3.28 
315cf74025 Help: Note CMAKE_IOS_INSTALL_COMBINED deprecation in toolchains example
af2e4379fc Help: Fix typo not accounting for addition of visionOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9112
 2023-12-31 19:29:43 -05:00
Kitware Robot aea1365e6f CMake Nightly Date Stamp 2023-12-31 00:01:06 -05:00
Craig Scott 315cf74025 Help: Note CMAKE_IOS_INSTALL_COMBINED deprecation in toolchains example 2023-12-30 18:38:05 +11:00
Craig Scott af2e4379fc Help: Fix typo not accounting for addition of visionOS 2023-12-30 18:36:34 +11:00
Kitware Robot 76b585ecc8 CMake Nightly Date Stamp 2023-12-30 00:01:06 -05:00
Kitware Robot 8dc21f4b5a CMake Nightly Date Stamp 2023-12-29 00:01:05 -05:00
Ben Boeckel eebf239d9c Merge branch 'cxxmodules-no-compile-commands-modmap-release' into cxxmodules-no-compile-commands-modmap 
* cxxmodules-no-compile-commands-modmap-release:
  cmNinjaTargetGenerator: use scan flag for modmap usage in exported commands
 2023-12-28 10:58:35 -05:00
Kitware Robot 158ecdced2 CMake Nightly Date Stamp 2023-12-28 00:01:06 -05:00
Kitware Robot 74f1e6612e CMake Nightly Date Stamp 2023-12-27 00:01:05 -05:00
Ben Boeckel 4962eba981 cmDyndepCollation: clarify CXX_MODULES-without-BMI error message 
Fixes: #25493
 2023-12-26 11:07:15 -05:00
Kitware Robot b2ea53f484 CMake Nightly Date Stamp 2023-12-26 00:01:10 -05:00
Kitware Robot 0064ac4a55 CMake Nightly Date Stamp 2023-12-25 00:01:28 -05:00
Kitware Robot 1e37448710 CMake Nightly Date Stamp 2023-12-24 00:01:07 -05:00
Marc Chevrier 19ac2034a9 Merge branch 'release-3.28' 2023-12-23 05:39:10 -05:00
Marc Chevrier 179c036b5d Merge topic 'Ninja-LINK_OPTIONS-with-newlines' 
255c2e1430 Ninja: LINK_OPTIONS property should support newlines

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9096
 2023-12-23 05:39:10 -05:00
Marc Chevrier 73d0160134 Merge topic 'Ninja-LINK_OPTIONS-with-newlines' into release-3.28 
255c2e1430 Ninja: LINK_OPTIONS property should support newlines

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9096
 2023-12-23 05:39:09 -05:00
Kitware Robot 6d578ab5f8 CMake Nightly Date Stamp 2023-12-23 00:01:06 -05:00
Ben Boeckel 73fbad3d93 cmNinjaTargetGenerator: use scan flag for modmap usage in exported commands 
See: https://discourse.cmake.org/t/how-to-control-the-location-of-the-c-20-binary-module-interface-bmi-output-directory/7968
 2023-12-22 16:18:18 -05:00
Kitware Robot 421cc38a54 CMake Nightly Date Stamp 2023-12-22 00:01:04 -05:00
Kitware Robot f8b165dcd6 CMake Nightly Date Stamp 2023-12-21 00:01:06 -05:00
Marc Chevrier 255c2e1430 Ninja: LINK_OPTIONS property should support newlines 
Fixes: #25513
 2023-12-20 17:05:09 +01:00
Brad King 82c00572a3 Merge topic 'copyright-year' 
4bc97565d0 Copyright.txt: Update year range to end in 2024

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9091
 2023-12-20 09:14:20 -05:00
Brad King e6cd118f02 Merge topic 'package-dispatch-apple' 
4ac5a2f866 CMakePackageConfigHelpers: Add generate_apple_architecture_selection_file()
b9f81ee9f9 CMakePackageConfigHelpers: Remove outdated documentation summary paragraph
68a03cf3d4 generate_apple_platform_selection_file: Add INSTALL_PREFIX option
ff21f0f70f Tests: Verify generate_apple_platform_selection_file file paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9092
 2023-12-20 09:12:49 -05:00
Brad King 30a56df0a8 Merge topic 'cmake-presets-empty-architecture' 
0654051dde CMakePresets.json: Don't use architecture and toolset if empty

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9093
 2023-12-20 09:11:20 -05:00
Brad King a350d92c06 Merge topic 'add_test-CROSSCOMPILING_EMULATOR-exclusive' 
ca5a300d7f add_test: Honor CROSSCOMPILING_EMULATOR only when cross-compiling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8947
 2023-12-20 09:09:48 -05:00
Brad King 5c1990fc51 Merge topic 'swift-CMP0157-old' 
d31b48816c Swift/Ninja: Fix missing OFM in CMP0157 OLD behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9089
 2023-12-20 09:08:53 -05:00
Brad King c0ab859154 Merge topic 'FindCURL-pkg-config' 
ab6b44b1bb FindCURL: Fix parsing protocols/features from pkg-config output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9090
 2023-12-20 09:06:08 -05:00