mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity
66,840 Commits 2 Branches 385 Tags
fd72e2b857c82cfac63547e4d9460bfb292e9610
Commit Graph

66840 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
fd72e2b857 Merge topic 'test-xcode-command-line-tools' 
369052b5d8 Tests: Restore suppression of xcodebuild error with Xcode Command-Line Tools

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9696
 2024-08-01 09:58:10 -04:00
Kitware Robot
bd8dc7775b CMake Nightly Date Stamp 2024-08-01 00:01:17 -04:00
Brad King
369052b5d8 Tests: Restore suppression of xcodebuild error with Xcode Command-Line Tools 
In commit 40fa2c1c90 (Tests: Cleanup CMake_TEST_XCODE_VERSION code,
2024-04-29, v3.30.0-rc1~183^2) we accidentally stopped capturing the
stderr from `xcodebuild`, causing it to appear in cmake's output.
The error is incidental and tolerated, so do not let the user see it.
 2024-07-31 15:43:04 -04:00
Kitware Robot
a82af7aae1 CMake Nightly Date Stamp 2024-07-31 00:01:12 -04:00
Brad King
2903eb1963 Merge topic 'export-refactor-more-for-cps' 
8178fd43e9 export: Fix handling of import prefix
e5b73b60e3 export: Generalize GenerateImportFileConfig
cd217739f7 export: Refactor obtaining export information

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9684
 2024-07-30 10:21:52 -04:00
Brad King
40214f0def Merge topic 'clean-proto' 
61ce6a6eeb Source: Delete unused prototypes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9689
 2024-07-30 10:13:59 -04:00
Brad King
ce07554967 Merge topic 'enable_warnings' 
373b29bd3f Rename {_ => }CMAKE_INCLUDE_SYSTEM_FLAG_${lang}_WARNING

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Acked-by: Marcel Raad <marcel.raad@teamviewer.com>
Merge-request: !9688
 2024-07-30 10:13:05 -04:00
Kitware Robot
8639ac2aec CMake Nightly Date Stamp 2024-07-30 00:01:13 -04:00
Brad King
1d38212b71 Merge topic 'cmake-pkg-config-integration' 
8555c33d92 PkgC: Add cmake_pkg_config(EXTRACT) command
35734c8de3 PkgC: Add llpkgc to build

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9670
 2024-07-29 14:25:26 -04:00
Vito Gamberini
8555c33d92 PkgC: Add cmake_pkg_config(EXTRACT) command 
* Wraps the llpkgc parser with cmPkgConfigParser
* Adds various resolution and mangling code under cmPkgConfigResolver
* Documents new command cmake_pkg_config(EXTRACT). Documentation is written with
  the assumption additional subcommands will be added soon.
* Adds various tests for the above
 2024-07-29 13:14:46 -04:00
Vito Gamberini
35734c8de3 PkgC: Add llpkgc to build 2024-07-29 13:14:41 -04:00
Patrick H
373b29bd3f Rename {_ => }CMAKE_INCLUDE_SYSTEM_FLAG_${lang}_WARNING 
Although not documented publicly, projects may need to override
this variable.  Remove the private `_` prefix from its name.

Issue: #25103
 2024-07-29 11:50:02 -04:00
Brad King
e6453c200e Merge branch 'release-3.30' 2024-07-29 11:30:56 -04:00
Brad King
b410a11da9 Merge branch 'release-3.29' 2024-07-29 11:30:54 -04:00
Brad King
5277769a93 Merge branch 'release-3.28' 2024-07-29 11:30:52 -04:00
Brad King
bab6bc54a8 Merge branch 'release-3.29' into release-3.30 2024-07-29 11:30:23 -04:00
Brad King
8e15b0544b Merge branch 'release-3.30' into master 2024-07-29 11:28:46 -04:00
Brad King
cdca6814a5 Merge topic 'backport-test-curl-output' into release-3.30 
13fb20f4d3 Tests/RunCMake/file-DOWNLOAD: Update bad host name message for curl 8.9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9690
 2024-07-29 11:28:46 -04:00
Brad King
651fa9e6ce Merge branch 'release-3.28' into release-3.29 2024-07-29 11:13:13 -04:00
Brad King
5f38057728 Merge topic 'backport-test-curl-output' into release-3.29 
13fb20f4d3 Tests/RunCMake/file-DOWNLOAD: Update bad host name message for curl 8.9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9690
 2024-07-29 11:12:33 -04:00
Brad King
5b435c3672 Merge topic 'backport-test-curl-output' into release-3.28 
13fb20f4d3 Tests/RunCMake/file-DOWNLOAD: Update bad host name message for curl 8.9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9690
 2024-07-29 11:11:47 -04:00
Brad King
13fb20f4d3 Tests/RunCMake/file-DOWNLOAD: Update bad host name message for curl 8.9 2024-07-29 11:07:05 -04:00
Brad King
236d0ce55b Merge branch 'release-3.30' 2024-07-29 11:01:38 -04:00
Brad King
56eb3fb8ac Merge topic 'FindPython-WIN32-EXECUTABLE_DEBUG' 
c25df125e1 FindPython: Fix usage of cached variable _Python_EXECUTABLE_DEBUG

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Hillel Sims <hsims1@bloomberg.net>
Merge-request: !9686
 2024-07-29 11:01:38 -04:00
Brad King
21808be3bf Merge topic 'FindPython-WIN32-EXECUTABLE_DEBUG' into release-3.30 
c25df125e1 FindPython: Fix usage of cached variable _Python_EXECUTABLE_DEBUG

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Hillel Sims <hsims1@bloomberg.net>
Merge-request: !9686
 2024-07-29 11:01:34 -04:00
Brad King
d964c10b01 Merge branch 'release-3.30' 2024-07-29 10:59:00 -04:00
Brad King
b0ba99f152 Merge topic 'doc-add_test-typo' 
ca39258a66 Help: Fix typo in add_test documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9687
 2024-07-29 10:59:00 -04:00
Brad King
9adccab675 Merge topic 'doc-add_test-typo' into release-3.30 
ca39258a66 Help: Fix typo in add_test documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9687
 2024-07-29 10:58:59 -04:00
Vitaly Stakhovsky
61ce6a6eeb Source: Delete unused prototypes 2024-07-29 10:45:02 -04:00
Kitware Robot
feb67ce718 CMake Nightly Date Stamp 2024-07-29 00:03:14 -04:00
Kitware Robot
4b1df8320e CMake Nightly Date Stamp 2024-07-28 00:01:23 -04:00
Craig Scott
7abd532de8 Merge branch 'release-3.30' 2024-07-27 18:28:19 -04:00
Craig Scott
31609421f2 Merge topic 'fetchcontent-updates-disconnected' 
5df592ce31 FetchContent: Ensure can_fetch_default is set early enough
c233c51cb9 ExternalProject: Fix bad indenting for uses_terminal

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Silver Zachara <silver.zachara@gmail.com>
Merge-request: !9685
 2024-07-27 18:28:19 -04:00
Craig Scott
51b5d9f464 Merge topic 'fetchcontent-updates-disconnected' into release-3.30 
5df592ce31 FetchContent: Ensure can_fetch_default is set early enough
c233c51cb9 ExternalProject: Fix bad indenting for uses_terminal

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Silver Zachara <silver.zachara@gmail.com>
Merge-request: !9685
 2024-07-27 18:28:18 -04:00
Kitware Robot
f2393d820b CMake Nightly Date Stamp 2024-07-27 00:01:47 -04:00
Matthew Woehlke
8178fd43e9 export: Fix handling of import prefix 
Fix some additional places in export generation logic that were still
hard-coding the import prefix. Change cmGeneratorExpression::Preprocess
to take the desired prefix as an argument. (This replaces taking a
boolean whether to resolve relative paths; if a non-empty prefix is
given, that is used to resolve relative paths, otherwise relative paths
are left alone.) This should ensure that import properties always spell
the prefix according to the format being generated.
 2024-07-26 16:40:03 -04:00
Brad King
ca39258a66 Help: Fix typo in add_test documentation 2024-07-26 10:37:35 -04:00
Brad King
26302e120e Merge topic 'install-parallel-manifest' 
9799491c7e install: Write manifest file in parallel install

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9673
 2024-07-26 10:00:36 -04:00
Brad King
f967fff3f4 Merge topic 'update-curl' 
080d876a79 Utilities: Update hard-coded try_compile results for curl 8.9.0
c1a62dd104 curl: Set build options the way we need for CMake
54c5367320 Merge branch 'upstream-curl' into update-curl
8defd39611 curl 2024-07-24 (5040f7e9)
60bd6acfbf curl: Update script to get curl 8.9.0
7bfe120c07 Tests/RunCMake/file-DOWNLOAD: Update bad host name message for curl 8.9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9683
 2024-07-26 09:58:07 -04:00
Marc Chevrier
c25df125e1 FindPython: Fix usage of cached variable _Python_EXECUTABLE_DEBUG 
Fixes: #26163
 2024-07-26 14:36:20 +02:00
Kitware Robot
eac3afd8c5 CMake Nightly Date Stamp 2024-07-26 00:01:12 -04:00
Craig Scott
5df592ce31 FetchContent: Ensure can_fetch_default is set early enough 
The can_fetch_default variable needs to be set before the call to
_ep_write_gitupdate_script(). Move it to before that call and always
set the variable, even if arg_SCRIPT_FILE is not set. This makes the
generated git update script file easier to follow if someone tries to
follow what it is doing or wants to investigate problems and run it
manually.

Fixes: #26164
 2024-07-26 11:23:58 +10:00
Craig Scott
c233c51cb9 ExternalProject: Fix bad indenting for uses_terminal 2024-07-26 10:58:19 +10:00
Matthew Woehlke
e5b73b60e3 export: Generalize GenerateImportFileConfig 
Move some logic that is specific to CMake-format exports from
GenerateImportFileConfig to an overload of GenerateImportConfig, so that
the former can be moved (back) to the generic base class. This will
allow it to also be used for Common Package Specification exports. To
facilitate this, also add a method to get the format-specific character
used to separate the export file base name from the config suffix, so
that the rest of the logic to determine the file name can be shared.
 2024-07-25 18:33:35 -04:00
Matthew Woehlke
cd217739f7 export: Refactor obtaining export information 
Refactor methods in the build and install export file generators to have
the same, simplified API. Expose the resulting method as an abstract
method on the base class, so that it can be called from mode-agnostic
generators. While we're at it, refactor cmExportInstallFileGenerator's
version to use std::any_of.
 2024-07-25 18:33:35 -04:00
Martin Duffy
9799491c7e install: Write manifest file in parallel install 
Updates the parallel install to generate the install_manifest.txt file.
 2024-07-25 12:36:32 -04:00
Brad King
262a89c92b Merge topic 'export-refactor-for-cps' 
ff24058e46 export: Use std::all_of to collect exports
20fa4ce8d8 export: Factor out CMake-specific export generation (2/2)
6c66340a64 export: Fix const placement
1bceab3520 export: Factor out CMake-specific export generation (*/2)
a6cc595772 export: Factor out CMake-specific export generation (1/2)
0352376e44 export: Immediately report actual version required

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9646
 2024-07-25 11:16:52 -04:00
Brad King
f60c49b9bd Merge topic 'test-labels' 
fd3019380d Tests: Removed unused LABELS on CMake's own tests
8f6092fc20 Tests: Move ctest --print-labels case into RunCMake.CTestCommandLine

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9682
 2024-07-25 11:11:47 -04:00
Brad King
080d876a79 Utilities: Update hard-coded try_compile results for curl 8.9.0 2024-07-25 11:05:31 -04:00
Brad King
c1a62dd104 curl: Set build options the way we need for CMake 
Set options added by the update to curl 8.9.0.
 2024-07-25 11:05:26 -04:00