summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cxxmodules-error-message-improvement'Craig Scott2024-01-031-1/+2
|\ | | | | | | | | | | | | | | | | 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
| * cmDyndepCollation: clarify CXX_MODULES-without-BMI error messageBen Boeckel2023-12-261-1/+2
| | | | | | | | Fixes: #25493
* | Merge topic 'tests-quote-possibly-empty-arg'Craig Scott2024-01-031-1/+1
|\ \ | | | | | | | | | | | | | | | | | | d0f395525f Tests: Quote possibly empty string(REPLACE) argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9116
| * | Tests: Quote possibly empty string(REPLACE) argumentCraig Scott2024-01-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | CMake Nightly Date StampKitware Robot2024-01-031-1/+1
| | |
* | | Merge branch 'release-3.28'Craig Scott2024-01-020-0/+0
|\ \ \
| * \ \ Merge topic 'doc-dynamic-resource-spec-file' into release-3.28Craig Scott2024-01-021-20/+28
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b63f92f27 Help: Update missed text for dynamically generated resource spec files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9117
* | \ \ \ Merge topic 'doc-dynamic-resource-spec-file'Craig Scott2024-01-021-20/+28
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 9b63f92f27 Help: Update missed text for dynamically generated resource spec files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9117
| * | | | Help: Update missed text for dynamically generated resource spec filesCraig Scott2024-01-011-20/+28
| |/ / /
* | | | CMake Nightly Date StampKitware Robot2024-01-021-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2024-01-011-1/+1
| | | |
* | | | Merge branch 'release-3.28'Craig Scott2024-01-010-0/+0
|\ \ \ \ | |/ / /
| * | | Merge topic 'fix-redirect-links' into release-3.28Craig Scott2024-01-012-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a7927d028 Help: update lua.org links to be HTTPS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9114
* | \ \ \ Merge topic 'fix-redirect-links'Craig Scott2024-01-012-2/+2
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | | | | | | | | | | 5a7927d028 Help: update lua.org links to be HTTPS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9114
| * | | Help: update lua.org links to be HTTPSBen Boeckel2024-01-012-2/+2
| | |/ | |/| | | | | | | This is now a permanent redirect, so update links accordingly.
* | | Merge branch 'release-3.28'Craig Scott2024-01-010-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'doc-toolchains-apple' into release-3.28Craig Scott2024-01-011-4/+6
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | 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
* | | Merge topic 'doc-toolchains-apple'Craig Scott2024-01-011-4/+6
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | 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
| * | Help: Note CMAKE_IOS_INSTALL_COMBINED deprecation in toolchains exampleCraig Scott2023-12-301-3/+5
| | |
| * | Help: Fix typo not accounting for addition of visionOSCraig Scott2023-12-301-1/+1
| |/
* | CMake Nightly Date StampKitware Robot2023-12-311-1/+1
| |
* | CMake Nightly Date StampKitware Robot2023-12-301-1/+1
| |
* | CMake Nightly Date StampKitware Robot2023-12-291-1/+1
| |
* | CMake Nightly Date StampKitware Robot2023-12-281-1/+1
| |
* | CMake Nightly Date StampKitware Robot2023-12-271-1/+1
| |
* | CMake Nightly Date StampKitware Robot2023-12-261-1/+1
| |
* | CMake Nightly Date StampKitware Robot2023-12-251-1/+1
| |
* | CMake Nightly Date StampKitware Robot2023-12-241-1/+1
| |
* | Merge branch 'release-3.28'Marc Chevrier2023-12-230-0/+0
|\ \ | |/
| * Merge topic 'Ninja-LINK_OPTIONS-with-newlines' into release-3.28Marc Chevrier2023-12-237-1/+36
| |\ | | | | | | | | | | | | | | | | | | | | | 255c2e1430 Ninja: LINK_OPTIONS property should support newlines Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !9096
* | \ Merge topic 'Ninja-LINK_OPTIONS-with-newlines'Marc Chevrier2023-12-237-1/+36
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | 255c2e1430 Ninja: LINK_OPTIONS property should support newlines Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !9096
| * | Ninja: LINK_OPTIONS property should support newlinesMarc Chevrier2023-12-207-1/+36
| |/ | | | | | | Fixes: #25513
* | CMake Nightly Date StampKitware Robot2023-12-231-1/+1
| |
* | CMake Nightly Date StampKitware Robot2023-12-221-1/+1
| |
* | CMake Nightly Date StampKitware Robot2023-12-211-1/+1
| |
* | Merge topic 'copyright-year'Brad King2023-12-201-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 4bc97565d0 Copyright.txt: Update year range to end in 2024 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9091
| * | Copyright.txt: Update year range to end in 2024Brad King2023-12-191-1/+1
| | |
* | | Merge topic 'package-dispatch-apple'Brad King2023-12-2022-6/+218
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | CMakePackageConfigHelpers: Add generate_apple_architecture_selection_file()Brad King2023-12-1913-2/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a helper to select architecture-specific implementations of a package on an Apple-specific platform. Fixes: #25516
| * | | CMakePackageConfigHelpers: Remove outdated documentation summary paragraphBrad King2023-12-191-3/+0
| | | |
| * | | generate_apple_platform_selection_file: Add INSTALL_PREFIX optionBrad King2023-12-192-1/+18
| | | | | | | | | | | | | | | | This is necessary to forward to `configure_package_config_file`.
| * | | Tests: Verify generate_apple_platform_selection_file file pathsBrad King2023-12-1910-0/+12
| |/ /
* | | Merge topic 'cmake-presets-empty-architecture'Brad King2023-12-201-2/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | CMakePresets.json: Don't use architecture and toolset if emptyKyle Edwards2023-12-191-2/+3
| |/ / | | | | | | | | | Fixes: #24864
* | | Merge topic 'add_test-CROSSCOMPILING_EMULATOR-exclusive'Brad King2023-12-2013-2/+163
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | add_test: Honor CROSSCOMPILING_EMULATOR only when cross-compilingRalf Habacker2023-12-1913-2/+163
| | | | | | | | | | | | | | | | | | | | | | | | Add policy CMP0158 to provide compatibility for existing projects. Fixes: #23672
* | | | Merge topic 'swift-CMP0157-old'Brad King2023-12-203-4/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d31b48816c Swift/Ninja: Fix missing OFM in CMP0157 OLD behavior Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9089
| * | | | Swift/Ninja: Fix missing OFM in CMP0157 OLD behaviorEvan Wilde2023-12-193-4/+14
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CMP0157 old behavior omitted the output-file-map after the Swift build split because we stopped calling `EmitSwiftDependencyInfo` when we could not split the build because we didn't call `WriteObjectBuildStatement`. If we can't split the build, then we still need to include the OFM information to not break incremental builds.
* | | | Merge topic 'FindCURL-pkg-config'Brad King2023-12-201-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ab6b44b1bb FindCURL: Fix parsing protocols/features from pkg-config output Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9090
| * | | | FindCURL: Fix parsing protocols/features from pkg-config outputlingbin2023-12-191-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously `find_package(CURL COMPONENTS HTTP)` failed because the `CURL_SUPPORTED_PROTOCOLS` variable returned by pkg-config is a command-line fragment, but we need a semicolon-separated list.