mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-30 19:29:18 -06:00
Code Issues Packages Projects Releases Wiki Activity
64,384 Commits 2 Branches 390 Tags
b2ea53f4843233b9fe795ad6412287c5a13b663a
Commit Graph

64384 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Brad King
3df386a7c2 Merge topic 'doc-typo-dep-provider-method' 
d0ab70d57d Help: Fix typo in dependency provider method keyword

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9079
 2023-12-20 09:04:57 -05:00
Brad King
71d4aed185 Merge branch 'release-3.28' 2023-12-20 09:03:40 -05:00
Brad King
26c6d554e0 Merge topic 'UsePkgConfig-trailing-whitespace' 
61436858e4 UsePkgConfig: Restore removal of trailing whitespace from pkg-config output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9094
 2023-12-20 09:03:40 -05:00
Brad King
158316dc0c Merge topic 'UsePkgConfig-trailing-whitespace' into release-3.28 
61436858e4 UsePkgConfig: Restore removal of trailing whitespace from pkg-config output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9094
 2023-12-20 09:03:38 -05:00
Kitware Robot
1191f642c0 CMake Nightly Date Stamp 2023-12-20 00:01:08 -05:00
Jason E. Hale
61436858e4 UsePkgConfig: Restore removal of trailing whitespace from pkg-config output 
Since commit f73a5bfaa9 (UsePkgConfig: Replace exec_program() with
execute_process(), 2023-07-24, v3.28.0-rc1~321^2~6), trailing whitespace
was introduced into libraries linked, which violates CMP0004.
 2023-12-19 15:35:24 -05:00
Kyle Edwards
0654051dde CMakePresets.json: Don't use architecture and toolset if empty 
Fixes: #24864
 2023-12-19 10:19:03 -05:00
Ralf Habacker
ca5a300d7f add_test: Honor CROSSCOMPILING_EMULATOR only when cross-compiling 
Add policy CMP0158 to provide compatibility for existing projects.

Fixes: #23672
 2023-12-19 10:00:55 -05:00
lingbin
ab6b44b1bb FindCURL: Fix parsing protocols/features from pkg-config output 
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.
 2023-12-19 09:36:09 -05:00
Brad King
4ac5a2f866 CMakePackageConfigHelpers: Add generate_apple_architecture_selection_file() 
Add a helper to select architecture-specific implementations of a
package on an Apple-specific platform.

Fixes: #25516
 2023-12-19 08:56:30 -05:00
Brad King
b9f81ee9f9 CMakePackageConfigHelpers: Remove outdated documentation summary paragraph 2023-12-19 08:56:11 -05:00
Brad King
68a03cf3d4 generate_apple_platform_selection_file: Add INSTALL_PREFIX option 
This is necessary to forward to `configure_package_config_file`.
 2023-12-19 08:51:16 -05:00
Brad King
ff21f0f70f Tests: Verify generate_apple_platform_selection_file file paths 2023-12-19 08:27:44 -05:00
Brad King
4bc97565d0 Copyright.txt: Update year range to end in 2024 2023-12-19 08:12:37 -05:00
Brad King
bee73bce08 Merge topic 'doc-fileapi-launchers' 
6d962f3700 Help: Fix indentation level in fileapi docs for target attribute 'launchers'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9084
 2023-12-19 08:11:48 -05:00
Brad King
c3b4453b13 Merge topic 'gtest_discover_tests_error_message' 
2ea216a6bb GoogleTest: Add working directory to gtest_discover_tests error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9083
 2023-12-19 08:10:55 -05:00
Brad King
d2cbadf3b4 Merge topic 'package-dispatch-apple' 
dc5098429b CMakePackageConfigHelpers: Clarify Apple platform selection usage error
3b9586671c CMakePackageConfigHelpers: Clarify Apple platform selection template name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9087
 2023-12-19 08:10:15 -05:00
Brad King
923cb0ed2f Merge topic 'doc-package-dispatch-apple' 
1a6303aa8c CMakePackageConfigHelpers: Fix generate_apple_platform_selection_file docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9088
 2023-12-19 08:09:28 -05:00
Brad King
a5969ba2fd Merge branch 'release-3.28' 2023-12-19 08:04:01 -05:00
Brad King
49dc6a44e0 Merge topic 'Xcode-Check-Imported-Framework' 
defbfd6f55 Xcode: Restore support for standalone IMPORTED_LOCATION_<CONFIG>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9082
 2023-12-19 08:04:01 -05:00
Brad King
e9a3f3fb02 Merge topic 'Xcode-Check-Imported-Framework' into release-3.28 
defbfd6f55 Xcode: Restore support for standalone IMPORTED_LOCATION_<CONFIG>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9082
 2023-12-19 08:03:59 -05:00
Kitware Robot
2cad910ecb CMake Nightly Date Stamp 2023-12-19 00:01:06 -05:00
Evan Wilde
d31b48816c Swift/Ninja: Fix missing OFM in CMP0157 OLD behavior 
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.
 2023-12-18 19:42:53 -08:00
Brad King
1a6303aa8c CMakePackageConfigHelpers: Fix generate_apple_platform_selection_file docs 
Previously the documentation was not rendered correctly.
 2023-12-18 16:35:46 -05:00
Brad King
dc5098429b CMakePackageConfigHelpers: Clarify Apple platform selection usage error 
`generate_apple_platform_selection_file` requires `INSTALL_DESTINATION`.
 2023-12-18 14:57:27 -05:00
Brad King
3b9586671c CMakePackageConfigHelpers: Clarify Apple platform selection template name 
The template added by commit 37bc3400cd (CMakePackageConfigHelpers: Add
generate_apple_platform_selection_file(), 2023-11-03) is specific to
Apple platforms.  Give it an Apple-specific name.
 2023-12-18 14:28:34 -05:00
Brad King
edb10c5325 Merge topic 'package-dispatch-apple' 
1dd4a9baff Tests: Cover generate_apple_platform_selection_file on all platforms
3148db4533 CMakePackageConfigHelpers: Fix Apple platform selection for tvOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9077
 2023-12-18 10:56:43 -05:00
Marc Chevrier
defbfd6f55 Xcode: Restore support for standalone IMPORTED_LOCATION_<CONFIG> 
In commit 878ae03832 (macOS: IMPORTED framework: Honor SYSTEM target
property in all cases, 2023-08-27, v3.28.0-rc1~162^2) we broke support
for `IMPORTED_LOCATION_<CONFIG>` without `IMPORTED_CONFIGURATIONS`.
Previously it worked if the importing project's configurations match the
set of `IMPORTED_LOCATION_<CONFIG>` properties set.  Fix that case.

Fixes: #25506
Issue: #25515
 2023-12-18 10:18:25 -05:00
Alexander Krabler
2ea216a6bb GoogleTest: Add working directory to gtest_discover_tests error message 
If the working directory didn't exist, the old message just says:

    Error running test executable.

        Path: '<Path to test executable>'
        Result: No such file or directory
        Output:

This leads the user to the conclusion that the test executable doesn't
exist, which isn't true.  Make the true cause visible by reporting the
working directory in the error message.
 2023-12-18 09:03:51 -05:00
Ralf Habacker
6d962f3700 Help: Fix indentation level in fileapi docs for target attribute 'launchers' 
The mentioned attribute is on the top level, not below the `install`
attribute.

This was missed in commit 80a64c9ce5 (fileapi: Add cross-compilation
emulator to codemodel-v2, 2023-11-11).

Issue: #25408
 2023-12-18 08:51:30 -05:00
Kitware Robot
43e6d30061 CMake Nightly Date Stamp 2023-12-18 00:01:56 -05:00
Craig Scott
50e8791f92 Merge topic 'fc-provider-find-package-args' 
0415304970 FetchContent: Fix FIND_PACKAGE_ARGS not being passed to dep providers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9080
 2023-12-17 15:43:00 -05:00
Craig Scott
b7ad9bd8f3 Merge topic 'doc-fc-fully-disconnected' 
18c514a86d Help: Add note not to use FETCHCONTENT_FULLY_DISCONNECTED on first run

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9081
 2023-12-17 15:38:06 -05:00
Craig Scott
a8dcc2c6c2 Merge topic 'doc-embed-xcode-limitations' 
ba5882a6c1 Help: Document Xcode project visibility constraints for embedding

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9078
 2023-12-17 15:35:08 -05:00