mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-19 21:01:05 -05:00
Code Issues Packages Projects Releases Wiki Activity
64,405 Commits 2 Branches 396 Tags
370370364b178e90cff291cfdcffe89716cd09dc
Commit Graph

64405 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Maynard
370370364b cmake-gui: Add support for preset toolchain entry 
Previously the toolchain field was ignored when passing a preset
to cmake-gui.

Fixes: #24034
 2024-01-05 12:01:44 -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
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
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
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