Commit Graph

72760 Commits

Author SHA1 Message Date
Brad King
8afe5f227c ExternalProject: Fix environment modification ops named with underscores
Extend commit e301cbffcc (ExternalProject: Set environment variables,
2025-04-09, v4.2.0-rc1~480^2) and commit 9cb590b843 (ExternalProject:
Fix lists and empty commands with environment modification, 2025-09-11,
v4.2.0-rc1~9^2) to match `_` in environment modification operation
names.

Fixes: #27409
2025-11-24 11:49:30 -05:00
Brad King
976e8ef053 Merge topic 'fix-cps-export-definitions' into release-4.2
37b15eda3b CPS: Fix exporting definitions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !11436
2025-11-22 18:52:58 -05:00
Brad King
19fc5545d3 Merge topic 'test-try_compile-error-formatting' into release-4.2
db1657b6a6 Tests/TryCompile: Improve error message formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11435
2025-11-22 18:51:46 -05:00
Brad King
354a8cdc8e Merge topic 'ci-sccache-idle' into release-4.2
1e3ccf9484 ci: Tolerate sccache server stop failures on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !11434
2025-11-22 18:50:34 -05:00
Brad King
0023ff59e4 Merge topic 'doc-4.2-cpack-appimage' into release-4.2
588fec2a05 Help: Add 4.2 release note for CPack AppImage generator
20dd0973b6 Help: Fix CPack AppImage Generator heading capitalization

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11433
2025-11-22 18:47:43 -05:00
Matthew Woehlke
37b15eda3b CPS: Fix exporting definitions
Export compile definitions to CPS using the correct attribute name.

Fixes: #27403
2025-11-21 15:32:41 -05:00
Brad King
db1657b6a6 Tests/TryCompile: Improve error message formatting 2025-11-21 14:49:08 -05:00
Brad King
1e3ccf9484 ci: Tolerate sccache server stop failures on Windows
Do not fail a build job because `SCCACHE_IDLE_TIMEOUT` was reached.
2025-11-21 12:00:25 -05:00
Brad King
588fec2a05 Help: Add 4.2 release note for CPack AppImage generator
This was missed in commit 1a6dbcc9ea (CPack: Add AppImage generator,
2025-07-30, v4.2.0-rc1~229^2).

Issue: #27104
2025-11-21 10:07:15 -05:00
Brad King
20dd0973b6 Help: Fix CPack AppImage Generator heading capitalization 2025-11-21 10:07:13 -05:00
Brad King
2fbdf51cdd Merge topic 'vs2026-arm64' into release-4.2
376b93f48f Tests/RunCMake/GeneratorToolset: Fix Visual Studio 18 2026 host arch on ARM64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11432
2025-11-21 08:24:41 -05:00
Brad King
16c7b28dc0 Merge topic 'vs2026-android' into release-4.2
863dc3a7ac VS/Android: Use ApplicationTypeRevision 3.0 in VS2026

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11431
2025-11-21 08:23:08 -05:00
Brad King
37209a0f28 Merge topic 'ci-cmake-update' into release-4.2
f5cc8869fb ci: Update CMake version to 4.2.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !11430
2025-11-21 08:21:33 -05:00
Brad King
376b93f48f Tests/RunCMake/GeneratorToolset: Fix Visual Studio 18 2026 host arch on ARM64
This was missed in commit 3392b371e2 (VS: Add Visual Studio 18 2026
generator, 2025-08-20, v4.2.0-rc1~165^2~1).
2025-11-20 18:56:41 -05:00
Brad King
863dc3a7ac VS/Android: Use ApplicationTypeRevision 3.0 in VS2026
Extend commit e78abf94e3 (VS/Android: Use ApplicationTypeRevision 3.0 in
VS2022, 2023-04-21, v3.27.0-rc1~165^2~4) to cover VS 2026 too.  This was
missed in commit 3392b371e2 (VS: Add Visual Studio 18 2026 generator,
2025-08-20, v4.2.0-rc1~165^2~1).
2025-11-20 14:06:11 -05:00
Brad King
f5cc8869fb ci: Update CMake version to 4.2.0 2025-11-20 10:57:05 -05:00
Brad King
a0c7f1d29c CMake 4.2.0 v4.2.0 2025-11-19 08:57:10 -05:00
Brad King
5a5681c256 Merge topic 'autogen-tgt-intdir-strategy-docs' into release-4.2
7d871d7857 Help/CMAKE_AUTOGEN_INTERMEDIATE_DIR_STRATEGY: document supported generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11429
2025-11-19 08:48:28 -05:00
Brad King
ebb4980c55 Merge topic 'vs-slnx' into release-4.2
06178da668 VS: Add include_external_msproject detection of `.wapproj` type
b9ce07b85b VS: Add SLNX project types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11428
2025-11-19 08:47:05 -05:00
Ben Boeckel
7d871d7857 Help/CMAKE_AUTOGEN_INTERMEDIATE_DIR_STRATEGY: document supported generators
Fixes: #27388
2025-11-18 16:28:11 -05:00
Brad King
06178da668 VS: Add include_external_msproject detection of .wapproj type
It is a Windows Application Packaging Project.

Issue: #27392
2025-11-18 11:18:17 -05:00
Brad King
b9ce07b85b VS: Add SLNX project types
Extend commit e6aa7742b0 (VS: Generate .slnx files for VS 2026,
2025-09-17, v4.2.0-rc1~151^2) to add the `Type=` attribute on SLNX
`<Project>` elements.

Fixes: #27392
2025-11-18 11:10:22 -05:00
Brad King
be291692bf Merge branch 'release-4.1' into release-4.2 2025-11-18 10:37:32 -05:00
Brad King
5961f5f3bc CMake 4.1.3 v4.1.3 2025-11-18 09:55:48 -05:00
Brad King
acfc50620b Merge branch 'release-4.1' into release-4.2 2025-11-18 09:44:46 -05:00
Brad King
89b555f1b5 Merge branch 'release-4.0' into release-4.1 2025-11-18 09:43:32 -05:00
Brad King
5517be2bf1 CMake 4.0.5 v4.0.5 2025-11-18 09:16:12 -05:00
Brad King
319bd95041 Merge branch 'release-4.1' into release-4.2 2025-11-18 09:06:03 -05:00
Brad King
972abd527e Merge topic 'doc-string-xref' into release-4.2
510d81c7bc Help: Avoid reST named references in string(JSON) synopsis
6c0f37546f Help: Improve string(JSON) synopsis document source readability

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11426
2025-11-18 09:05:16 -05:00
Brad King
b6f13dabc4 Merge branch 'release-4.0' into release-4.1 2025-11-18 09:04:03 -05:00
Brad King
407a80260b Merge topic 'doc-string-xref' into release-4.1
510d81c7bc Help: Avoid reST named references in string(JSON) synopsis
6c0f37546f Help: Improve string(JSON) synopsis document source readability

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11426
2025-11-18 09:03:41 -05:00
Brad King
96a6b2be06 Merge branch 'release-3.31' into release-4.0 2025-11-18 09:03:27 -05:00
Brad King
e54eda8159 Merge topic 'doc-string-xref' into release-4.0
510d81c7bc Help: Avoid reST named references in string(JSON) synopsis
6c0f37546f Help: Improve string(JSON) synopsis document source readability

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11426
2025-11-18 09:03:15 -05:00
Brad King
6672acb8b4 Merge topic 'doc-string-xref' into release-3.31
510d81c7bc Help: Avoid reST named references in string(JSON) synopsis
6c0f37546f Help: Improve string(JSON) synopsis document source readability

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11426
2025-11-18 09:01:58 -05:00
Brad King
510d81c7bc Help: Avoid reST named references in string(JSON) synopsis
Also revert commit 9702a01dc9 (Help: string(LENGTH): Fix synopsis link
to command description, 2023-12-30, v3.28.2~23^2).  It was only needed
to avoid re-using a named reference that we've now removed.

Issue: #25546
2025-11-17 16:31:37 -05:00
Brad King
6c0f37546f Help: Improve string(JSON) synopsis document source readability
Avoid spaces in signature target names.
2025-11-17 16:31:37 -05:00
Brad King
952e000d38 Merge branch 'release-4.1' into release-4.2 2025-11-17 16:27:01 -05:00
Brad King
1d303f6beb Merge branch 'release-4.0' into release-4.1 2025-11-17 16:26:50 -05:00
Brad King
b4528858f8 Merge branch 'release-3.31' into release-4.0 2025-11-17 16:26:39 -05:00
Brad King
ca626022f5 CMake 3.31.10 v3.31.10 2025-11-17 14:28:31 -05:00
Brad King
9c091c7d17 CMake 4.2.0-rc4 v4.2.0-rc4 2025-11-17 10:32:25 -05:00
Brad King
38e86c8ea4 Merge topic 'vs-slnx' into release-4.2
70ed720232 VS: Add SLNX default startup project

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11420
2025-11-15 09:01:48 -05:00
Brad King
9e38d74019 Merge topic 'fbuild_fix_pch' into release-4.2
878d154322 FASTBuild: fix multi-language PCHs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11404
2025-11-15 08:59:03 -05:00
Brad King
70ed720232 VS: Add SLNX default startup project
At the time of commit e6aa7742b0 (VS: Generate .slnx files for VS 2026,
2025-09-17, v4.2.0-rc1~151^2), the VS 18 Insiders edition did not offer
support for specifying a default startup project in `.slnx` files.
This has since been added, so use it.

Fixes: #27387
2025-11-14 11:03:57 -05:00
Brad King
64a9839c25 Merge topic 'doc-typos-cleanup-4.2' into release-4.2
730cad9cb6 Help: Fix typos and formatting for 4.2 release

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11418
2025-11-14 09:49:17 -05:00
Brad King
ef89890a1a Merge topic 'vs-slnx' into release-4.2
7c284f4278 VS: Fix SLNX with multiple solution-to-project configuration mappings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11415
2025-11-14 09:46:31 -05:00
Brad King
ea722c9b0b Merge topic 'clang-analyzer' into release-4.2
742c70a5da autogen: Remove unnecessary nullptr check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11414
2025-11-14 09:40:56 -05:00
Brad King
530cc99c11 Merge branch 'release-4.1' into release-4.2 2025-11-14 09:38:36 -05:00
Brad King
15f30a43b7 Merge topic 'ci-xcode-26.1' into release-4.2
cf10b47e57 ci: update macOS jobs to use Xcode 26.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11416
2025-11-14 09:35:25 -05:00
Brad King
50380f1bc1 Merge branch 'release-4.0' into release-4.1 2025-11-14 09:31:27 -05:00