mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-08 07:10:12 -05:00
Code Issues Packages Projects Releases Wiki Activity
71,889 Commits 2 Branches 401 Tags
d75c507d0af391c0ea535ffff54c49798542952c
Commit Graph

71889 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King d75c507d0a Merge topic 'instrumentation-trace' 
8d04c4d741 Experimental: Update the Instrumentation UUID
bf52fbfbc4 instrumentation: Add Google trace output
b6dcbc4387 Tests/RunCMake/Instrumentation: Improve formatting
27bc7d5782 Tests/RunCMake/Instrumentation: Factor out common JSON logic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !11124
 2025-09-04 09:15:59 -04:00
Brad King 69edf00b57 Merge topic 'fastbuild-instrumentation' 
903d35353f instrumentation: Update tests and documentation for FASTBuild support
bd24854d56 FASTBuild: Expand TargetLabels and Config for Link Commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Eduard Voronkin <edward.voronkin@gmail.com>
Merge-request: !11135
 2025-09-04 09:13:00 -04:00
Kitware Robot 38904e285b CMake Nightly Date Stamp 2025-09-04 00:05:11 -04:00
Tyler Yankee 8d04c4d741 Experimental: Update the Instrumentation UUID 
Update experimental UUID for instrumentation after commit bf52fbfbc4
(instrumentation: Add Google trace output, 2025-08-28) introduced a
significant feature.
 2025-09-03 15:24:40 -04:00
Tyler Yankee bf52fbfbc4 instrumentation: Add Google trace output 
Add a feature to parse snippets into a trace file compatible with the
Google Trace Event Format.

Fixes: #26674
 2025-09-03 15:24:10 -04:00
Martin Duffy 903d35353f instrumentation: Update tests and documentation for FASTBuild support 
Fixes: #27184
 2025-09-03 10:49:51 -04:00
Martin Duffy bd24854d56 FASTBuild: Expand TargetLabels and Config for Link Commands 2025-09-03 10:40:17 -04:00
Brad King 00185a62cf Merge topic 'cps-fix-imported-configs' 
eb51e55dcd cmPackageInfoReader: Fix IMPORTED_CONFIGURATIONS
c6a6d47233 find_package: CPS targets use CMP0200

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !11120
 2025-09-03 10:25:09 -04:00
Brad King 2b41d76aad Merge topic 'fbuild_fix_rules' 
2db39a59b5 FASTBuild: fix inconsistencies in rules application

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Vito Gamberini <vito.gamberini@kitware.com>
Merge-request: !11133
 2025-09-03 10:23:12 -04:00
Brad King 057ec3864d Merge branch 'release-4.1' 2025-09-03 10:20:17 -04:00
Brad King aaf0586813 Merge topic 'ninja-custom-command-comment-syntax' 
1bf48e34f4 Ninja: escape special characters in custom command comments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !11136
 2025-09-03 10:20:17 -04:00
Brad King a4dd4f3dad Merge topic 'ninja-custom-command-comment-syntax' into release-4.1 
1bf48e34f4 Ninja: escape special characters in custom command comments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !11136
 2025-09-03 10:20:15 -04:00
Brad King 1f5f063ea1 Merge branch 'release-4.1' 2025-09-03 10:17:16 -04:00
Brad King 7eec7ca851 Merge topic 'project-version-fix' 
aa16b8eb9a project: Revert changes to VERSION handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !11131
 2025-09-03 10:17:16 -04:00
Brad King 08b9257473 Merge topic 'project-version-fix' into release-4.1 
aa16b8eb9a project: Revert changes to VERSION handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !11131
 2025-09-03 10:17:12 -04:00
Brad King 8e7cbd07f8 Merge branch 'release-4.1' 2025-09-03 10:14:38 -04:00
Brad King cf8ddadd06 Merge branch 'release-4.0' 2025-09-03 10:14:32 -04:00
Brad King 1d534e8128 Merge branch 'release-3.31' 2025-09-03 10:14:26 -04:00
Brad King 154bab609c Merge branch 'release-4.0' into release-4.1 2025-09-03 10:14:14 -04:00
Brad King 1a9bf5e2d4 Merge branch 'release-4.1' 2025-09-03 10:13:32 -04:00
Brad King c92268f91b Merge topic 'curl-opt-proxytype' 
c8143074cf cmCTestCurl: Avoid using undocumented type for CURLOPT_PROXYTYPE values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11134
 2025-09-03 10:13:32 -04:00
Brad King cd7cd67fd5 Merge topic 'curl-opt-proxytype' into release-4.1 
c8143074cf cmCTestCurl: Avoid using undocumented type for CURLOPT_PROXYTYPE values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11134
 2025-09-03 10:13:30 -04:00
Brad King a51ae8b7f9 Merge branch 'release-3.31' into release-4.0 2025-09-03 10:12:42 -04:00
Brad King 2bc0c335ce Merge topic 'curl-opt-proxytype' into release-4.0 
c8143074cf cmCTestCurl: Avoid using undocumented type for CURLOPT_PROXYTYPE values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11134
 2025-09-03 10:12:21 -04:00
Brad King 2ea11c1a6e Merge topic 'curl-opt-proxytype' into release-3.31 
c8143074cf cmCTestCurl: Avoid using undocumented type for CURLOPT_PROXYTYPE values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11134
 2025-09-03 10:11:43 -04:00
Brad King ab0769f25d Merge topic 'tests-fix-generator-matching' 
724eb18d57 RunCMake/Autogen_1: handle short expectations on VS correctly
b64226f2b4 cmGeneratorTarget: only apply short object names when necessary
b9a88d1211 Tests/UnityBuild: fix generator-specific VS unity source path expectations
dd87d25845 Tests/PrecompileHeaders: fix generator-specific pch path expectations
7ec26a5f42 Tests/RunCMake: test `RunCMake_GENERATOR` instead of `CMAKE_GENERATOR`
92cab8edae Tests/PrecompileHeaders: fix expectation for pch objects
b1ccad8651 cmGeneratorTarget: disambiguate pch objects for multi-config generators
fe0163cd23 autogen: compute short directories too
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11050
 2025-09-03 09:39:51 -04:00
Kitware Robot 03a320f426 CMake Nightly Date Stamp 2025-09-03 00:05:21 -04:00
Ben Boeckel 1bf48e34f4 Ninja: escape special characters in custom command comments 
Considerations of Ninja's control sequences was not considered in
30fb5b1b22 (Ninja: add COMMENT to build statement descriptions,
2024-05-01) via !9484. Escape both newlines and dollar signs.

Fixes: #27181
 2025-09-02 15:33:20 -04:00
Ben Boeckel 724eb18d57 RunCMake/Autogen_1: handle short expectations on VS correctly 2025-09-02 12:56:24 -04:00
Ben Boeckel b64226f2b4 cmGeneratorTarget: only apply short object names when necessary 
When there is no PCH extension, there is no source file necessary as the
source is not compiled at all.
 2025-09-02 12:56:23 -04:00
Ben Boeckel b9a88d1211 Tests/UnityBuild: fix generator-specific VS unity source path expectations 2025-09-02 12:56:23 -04:00
Ben Boeckel dd87d25845 Tests/PrecompileHeaders: fix generator-specific pch path expectations 2025-09-02 12:56:23 -04:00
Ben Boeckel 7ec26a5f42 Tests/RunCMake: test RunCMake_GENERATOR instead of CMAKE_GENERATOR 2025-09-02 12:56:23 -04:00
Ben Boeckel 92cab8edae Tests/PrecompileHeaders: fix expectation for pch objects 2025-09-02 12:56:23 -04:00
Ben Boeckel b1ccad8651 cmGeneratorTarget: disambiguate pch objects for multi-config generators 2025-09-02 12:56:23 -04:00
Ben Boeckel fe0163cd23 autogen: compute short directories too 
Not just short directory roots. The test suites did an improper
generator check and masked them as the generator masks were put in place
after the core development but before the autogen-specific logic tests
were created.
 2025-09-02 12:56:23 -04:00
Ben Boeckel 6e3b691ddc RunCMake/PrecompileHeaders: restore test for PchInterfaceShort 2025-09-02 12:56:23 -04:00
Eduard Voronkin 2db39a59b5 FASTBuild: fix inconsistencies in rules application 
Fix `ApplyLinkRuleLauncher()` to apply `RULE_LAUNCH_COMPILE`.
Remove ApplyCompileRuleLauncher since it's not used and `RULE_LAUNCH_COMPILE` is handled in `AddCompilerLaunchersForLanguages()`
Fixes: #27183
 2025-09-02 09:33:23 -07:00
Brad King c8143074cf cmCTestCurl: Avoid using undocumented type for CURLOPT_PROXYTYPE values 
Since upstream curl commit `1a12663d06` (CURLOPT: bump `CURLPROXY_*`
enums to `long`, drop casts, 2025-07-28), the `CURLPROXY_*` constants
are integer literals instead of `enum curl_proxytype`.  It turns out
that `curl_easy_setopt` has always expected a `long` anyway, and that
`curl_proxytype` is not documented for public use.

Fixes: #27178
 2025-09-02 11:41:10 -04:00
Matthew Woehlke eb51e55dcd cmPackageInfoReader: Fix IMPORTED_CONFIGURATIONS 
Rework how we assign imported configurations to only add configurations
that are actually imported. This requires a certain amount of cleverness
to keep the order consistent with the package's specified default
configurations, but doing this is important now that configuration
selection (see policies CMP0199 and CMP0200) is more reliant on the
IMPORTED_CONFIGURATIONS property being accurate, rather than focusing on
whether configuration-specific properties are set.
 2025-09-02 11:40:18 -04:00
Matthew Woehlke c6a6d47233 find_package: CPS targets use CMP0200 
Tweak CPS import to actually set CMP0200 NEW on targets imported from
CPS (as the documentation claims we do).
 2025-09-02 11:40:18 -04:00
Brad King 1dfe9898e6 Merge topic 'fix-config-selection' 
a40896c0e4 cmTarget: Fix (new) configuration selection
702b7fda49 cmTarget: Improve code style

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !11122
 2025-09-02 10:57:56 -04:00
Brad King 54e7008e2d Merge topic 'vs-cleanup' 
78d9564d50 cmGlobalVisualStudio7Generator: Inline short method at only call site
034cc29b89 cmGlobalVisualStudio7Generator: Constify .sln write methods
5004602715 cmGlobalVisualStudio7Generator: Factor folder collection out of write method
6ae4ed30d9 cmGlobalVisualStudio7Generator: Factor target collection out of write method
5582eb292e cmGlobalVisualStudio7Generator: Update outdated comment
2297ba9399 cmGlobalVisualStudio7Generator: Remove redundant C++ modules check
ccbd61dd53 cmGlobalVisualStudio7Generator: Remove unused member
93e34a5e0e cmGlobalGenerator: Constify GetTargetDirectDepends
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11130
 2025-09-02 10:56:09 -04:00
Brad King f70a8f890b Merge topic 'aix-clang-compiler-target' 
c482a8833a AIX: Fix shared library linking with CMAKE_<LANG>_COMPILER_TARGET

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11113
 2025-09-02 10:54:21 -04:00
Brad King a17394f334 Merge topic 'mingw-host-system-version' 
5a919e6601 cmake: Fix CMAKE_HOST_SYSTEM_VERSION when built for MinGW

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11112
 2025-09-02 10:17:33 -04:00
Brad King c36c19d711 Merge topic 'patch-CheckIncludeFiles-LANGUAGE' 
5000f895fd CheckIncludeFiles: Document version 3.11 for LANGUAGE option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11123
 2025-09-02 09:52:24 -04:00
Brad King 1873914be3 Merge branch 'release-4.1' 2025-09-02 09:48:07 -04:00
Brad King dcb82f6d6d Merge topic 'cmPropertySentinel-definition' 
319c427d2f cmPropertySentinel: update definition

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11129
 2025-09-02 09:48:07 -04:00
Brad King cc6dc6ba85 Merge topic 'cmPropertySentinel-definition' into release-4.1 
319c427d2f cmPropertySentinel: update definition

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11129
 2025-09-02 09:48:02 -04:00
Brad King 5fc70d2131 Merge branch 'release-4.1' 2025-09-02 09:42:43 -04:00