Commit Graph

72915 Commits

Author SHA1 Message Date
Brad King
1bd6e70430 Merge branch 'backport-4.0-fileapi-instrumentation-initial-cache' 2026-01-15 15:14:01 -05:00
Brad King
8523e579dc Merge branch 'backport-3.31-fileapi-initial-cache' 2026-01-15 15:13:13 -05:00
Martin Duffy
4d712cfc25 fileapi: Fix crash on cmake_file_api() call in initial cache 2026-01-15 14:51:57 -05:00
Brad King
048f2924bf Merge branch 'release-4.1' into release-4.2 2026-01-14 08:50:41 -05:00
Brad King
79a61958b4 Merge topic 'ci-cuda-archs' into release-4.2
ba5b89afb3 ci: Fix CUDA tests on GPUs newer than the toolkit supports

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11592
2026-01-14 08:49:53 -05:00
Brad King
5bc44d4a38 Merge branch 'release-4.0' into release-4.1 2026-01-14 08:49:14 -05:00
Brad King
cd4c4f261b Merge topic 'ci-cuda-archs' into release-4.1
ba5b89afb3 ci: Fix CUDA tests on GPUs newer than the toolkit supports

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11592
2026-01-14 08:48:59 -05:00
Brad King
4f58ef85e4 Merge branch 'release-3.31' into release-4.0 2026-01-14 08:48:50 -05:00
Brad King
b5ec12599f Merge topic 'ci-cuda-archs' into release-4.0
ba5b89afb3 ci: Fix CUDA tests on GPUs newer than the toolkit supports

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11592
2026-01-14 08:48:30 -05:00
Brad King
cab0f6cfa8 Merge topic 'ci-cuda-archs' into release-3.31
ba5b89afb3 ci: Fix CUDA tests on GPUs newer than the toolkit supports

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11592
2026-01-14 08:47:52 -05:00
Brad King
0c2e4d8422 Merge topic 'fix-cmp0199' into release-4.2
35d5a4fd6d GenEx: Partially restore pre-CMP0199 behavior of $<CONFIG>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Matthew Woehlke <matthew.woehlke@kitware.com>
Merge-request: !11581
2026-01-13 11:05:09 -05:00
Brad King
acf4ea25e7 Merge topic 'fileapi-windows-implib-missing-error' into release-4.2
c6a940761c fileapi: Handle unused imported libraries with missing IMPORTED_IMPLIB

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !11585
2026-01-13 10:32:18 -05:00
Brad King
554f264cb2 Merge topic 'Windows-compilation-c++11' into release-4.2
a4a5690cd3 CMake: Restore support for compiling as C++11 on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11586
2026-01-13 10:26:35 -05:00
Brad King
ba5b89afb3 ci: Fix CUDA tests on GPUs newer than the toolkit supports
Extend commit ff8c0e9c10 (ci: Clamp CUDA 'native' architecture to values
supported by its toolkit, 2022-03-14, v3.24.0-rc1~468^2) to avoid
failures due to `nvcc -arch=native`.
2026-01-13 09:43:25 -05:00
Matthew Woehlke
35d5a4fd6d GenEx: Partially restore pre-CMP0199 behavior of $<CONFIG>
Modify the implementation of policy CMP0199 to only remove the oddball
configuration map matching of `$<CONFIG>` in `NEW` mode, restoring the
old behavior of matching BOTH the consumer's configuration and the
selected configuration of the imported target. It turns out that users
are more dependent on the former than the latter, and while matching
more than one thing is still dodgy, we will likely need to introduce a
new generator expression to match the selected configuration of the
imported target.

Meanwhile, `$<CONFIG>` on targets imported from CPS still only matches
the selected configuration of the imported target, which is the behavior
specified by CPS. However, this can only happen for `$<CONFIG>`
expressions that were generated internally during import.

Update documentation and test cases accordingly.

Fixes: #27487
Fixes: #27495
2026-01-12 10:58:08 -05:00
Marc Chevrier
a4a5690cd3 CMake: Restore support for compiling as C++11 on Windows
Fixes: #27505
2026-01-12 10:58:07 -05:00
Brad King
eba87f1834 Merge topic 'cpack-appimage-user-apprun' into release-4.2
078f28f16b CPack/AppImage: Add support for a custom AppRun file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11577
2026-01-12 09:18:32 -05:00
Brad King
7792c68838 Merge topic 'timeout-after-match-stop-time-behavior' into release-4.2
68beb2e514 Tests/CTestTimeoutAfterMatch: add case for stop time bug
af7427675a cmProcess: compute the timeout when needed
c6940b0dcc cmProcess: explicitly track the StopTimeout

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !11551
2026-01-09 09:58:10 -05:00
Brad King
92d65518e6 Merge topic 'vs-charset' into release-4.2
4419bf1182 VS: Restore unicode character set for custom targrets on WindowsStore

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11578
2026-01-09 09:48:19 -05:00
Mathieu
078f28f16b CPack/AppImage: Add support for a custom AppRun file
Allow the users to install a custom AppRun file.
Otherwise create a default one.

Fixes: #27478
2026-01-09 09:41:03 -05:00
Craig Scott
c6a940761c fileapi: Handle unused imported libraries with missing IMPORTED_IMPLIB
CMake 4.1 and earlier did not issue an error if an imported shared library target
was missing an IMPORTED_IMPLIB property and nothing used that imported
library. There was no code path checking for the CMP0111 NEW behavior. Since
b626843d71 (fileAPI: Output all INTERFACE and IMPORTED targets, 2025-09-13),
we now include all imported targets in the file API replies, and that does trigger
that check. We need to tolerate such imported targets to preserve backward
compatibility, and to avoid issuing errors for problems in targets likely to be
coming from outside the project and beyond the developer's control.

Fixes: #27496
2026-01-10 00:26:55 +11:00
Brad King
4419bf1182 VS: Restore unicode character set for custom targrets on WindowsStore
Restore conditions broken by commit 19a61e56cf (VS: Refactor MSVC
character set selection, 2025-10-10, v4.2.0-rc1~12^2~1).  We had misread
the purpose/scope of the `<= cmStateEnums::OBJECT_LIBRARY` condition.
In the original code it was only about safely indexing `ClOptions`,
not about the kinds of targets that can use a unicode character set.

Fixes: #27490
2026-01-08 11:46:11 -05:00
Brad King
884b86e8c8 Merge branch 'release-4.1' into release-4.2 2026-01-08 08:18:27 -05:00
Brad King
d3759c8c68 Merge topic 'ci-xcode-26.2' into release-4.2
bc18ef4400 ci: update macOS jobs to use Xcode 26.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11576
2026-01-08 08:14:47 -05:00
Brad King
95fb2486f8 Merge branch 'release-4.0' into release-4.1 2026-01-08 08:14:07 -05:00
Brad King
efed27c9ff Merge topic 'ci-xcode-26.2' into release-4.1
bc18ef4400 ci: update macOS jobs to use Xcode 26.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11576
2026-01-08 08:13:57 -05:00
Brad King
297d8f2708 Merge branch 'release-3.31' into release-4.0 2026-01-08 08:13:51 -05:00
Brad King
2e00e773f6 Merge topic 'ci-xcode-26.2' into release-4.0
bc18ef4400 ci: update macOS jobs to use Xcode 26.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11576
2026-01-08 08:13:42 -05:00
Brad King
92d75438dd Merge topic 'ci-xcode-26.2' into release-3.31
bc18ef4400 ci: update macOS jobs to use Xcode 26.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11576
2026-01-08 08:13:10 -05:00
Brad King
bc18ef4400 ci: update macOS jobs to use Xcode 26.2 2026-01-07 13:51:59 -05:00
Brad King
ad6643019e Merge topic 'fbuild_i18num_fix' into release-4.2
416d86ab32 FASTBuild: fix configure for non-English MSVC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11557
2026-01-07 10:38:27 -05:00
Brad King
c11bbed4bd Merge topic 'fbuild_plat_toolset' into release-4.2
af8771f974 FASTBuild: set PlatformToolset in the generated .bff file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11555
2026-01-07 10:31:03 -05:00
Brad King
458dff0bc8 Merge branch 'release-4.1' into release-4.2 2026-01-07 09:43:41 -05:00
Brad King
77371c0779 Merge topic 'ci-sccache-port-from-runner' into release-4.2
cb865362ed gitlab-ci: get the sccache server port from the runner

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11560
2026-01-07 09:34:18 -05:00
Brad King
b87059c03c Merge branch 'release-4.0' into release-4.1 2026-01-07 09:33:04 -05:00
Brad King
1c031c8a1d Merge topic 'ci-sccache-port-from-runner' into release-4.1
cb865362ed gitlab-ci: get the sccache server port from the runner

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11560
2026-01-07 09:32:51 -05:00
Brad King
4ae62b6709 Merge branch 'release-3.31' into release-4.0 2026-01-07 09:32:37 -05:00
Brad King
61b443f398 Merge topic 'ci-sccache-port-from-runner' into release-4.0
cb865362ed gitlab-ci: get the sccache server port from the runner

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11560
2026-01-07 09:32:26 -05:00
Brad King
bd9d4d5a8c Merge topic 'ci-sccache-port-from-runner' into release-3.31
cb865362ed gitlab-ci: get the sccache server port from the runner

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11560
2026-01-07 09:31:33 -05:00
Craig Scott
3bf895dc41 Merge topic 'doc-expand-appimage-generator' into release-4.2
b8c9c65682 Help: Correct and expand AppImage CPack generator docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11545
2026-01-07 06:45:57 -05:00
Ben Boeckel
68beb2e514 Tests/CTestTimeoutAfterMatch: add case for stop time bug
When there is no timeout, a stop time reason was made for any timeout,
including a case where a `TIMEOUT_AFTER_MATCH` would reset the timeout.
Add a test case.
2026-01-06 20:47:34 -05:00
Ben Boeckel
af7427675a cmProcess: compute the timeout when needed
When a timeout is updated during runtime (e.g., via
`TIMEOUT_AFTER_MATCH`), the actual timeout needs recomputed based on
consideration of `StopTimeout` as well. Instead of using `Timeout`
directly, add a `GetComputedTimeout` method which also retrieves the
timeout reason based on which timeout is selected.
2026-01-06 20:47:34 -05:00
Craig Scott
b8c9c65682 Help: Correct and expand AppImage CPack generator docs
The help text for most variables were just copy-and-pasted from the
minimal output from running `appimagetool --help`. That text lacked
considerable important detail.

The default values for most of the variables were also specified
incorrectly. They listed themselves as the default, which is wrong.
In most cases, the variables are unset by default. For those that
actually have fallback values, update them to specify that.

The CPACK_APPIMAGE_DESKTOP_FILE variable is not mandatory.
The code does provide fallback behavior when it isn't set. What is
mandatory though is that there is a .desktop file, either specified
explicitly, or found within the installed files. There is also a close
relationship with CPACK_PACKAGE_ICON that deserves explicitly
drawing attention to.
2026-01-07 08:46:59 +11:00
Eduard Voronkin
416d86ab32 FASTBuild: fix configure for non-English MSVC
Fixes: #27483
2026-01-06 16:45:38 -05:00
Eduard Voronkin
af8771f974 FASTBuild: set PlatformToolset in the generated .bff file
Fixes: #27481
2026-01-06 16:28:04 -05:00
Ben Boeckel
cb865362ed gitlab-ci: get the sccache server port from the runner
Our CI setup has per-project runner setups, so they are now providing
the port configuration. The main goal is to have Rosetta caches separate
from the native caches on macOS, but removing this removes a bit of
coupling to Kitware's CI setup.
2025-12-29 16:34:10 -05:00
Craig Scott
637da9c26a Merge topic 'doc-cleanup-4.2' into release-4.2
a7fc57ed1c Help: Restore correct sort order for property and variable manuals
e73307957e Help: Fix minor grammar problems

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11546
2025-12-23 19:27:31 -05:00
Ben Boeckel
c6940b0dcc cmProcess: explicitly track the StopTimeout
When a test can have its timeout reset, the stop time still needs to be
considered when setting the new timeout. Track it explicitly.
2025-12-22 13:34:31 -05:00
Craig Scott
a7fc57ed1c Help: Restore correct sort order for property and variable manuals 2025-12-21 20:51:52 +11:00
Craig Scott
e73307957e Help: Fix minor grammar problems 2025-12-21 20:51:52 +11:00