Commit Graph

72900 Commits

Author SHA1 Message Date
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
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
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
Brad King
68c8e0e3e5 Merge branch 'release-4.1' into release-4.2 2025-12-20 09:31:41 -05:00
Brad King
397d4b796f Merge topic 'sarif-path-encoding' into release-4.2
2eef2baf93 cmake: Fix SARIF diagnostics output path encoding on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11538
2025-12-20 09:30:57 -05:00
Brad King
b713b7299c Merge branch 'release-4.0' into release-4.1 2025-12-20 09:28:59 -05:00
Brad King
8039d1ffba Merge topic 'backport-sarif-path-encoding' into release-4.1
2eef2baf93 cmake: Fix SARIF diagnostics output path encoding on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11538
2025-12-20 09:28:36 -05:00
Brad King
4c0c3d6f9f Merge topic 'backport-sarif-path-encoding' into release-4.0
2eef2baf93 cmake: Fix SARIF diagnostics output path encoding on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11538
2025-12-20 09:28:06 -05:00
Brad King
2eef2baf93 cmake: Fix SARIF diagnostics output path encoding on Windows
Avoid using `filesystem::path` to hold the output path.  It performs
encoding conversions that violate our internal UTF-8 encoding.

Fixes: #27471
Issue: #27472
2025-12-19 14:33:42 -05:00
Brad King
a9c13c4144 Merge branch 'release-4.1' into release-4.2 2025-12-18 10:35:53 -05:00
Brad King
cfa16434c0 Merge topic 'doc-4.1-vs-flags' into release-4.2
ea357236f4 Help: Add 4.1 release note about VS link flag suppression

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11525
2025-12-18 10:35:12 -05:00
Brad King
54810df231 Merge topic 'doc-4.1-vs-flags' into release-4.1
ea357236f4 Help: Add 4.1 release note about VS link flag suppression

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11525
2025-12-18 10:34:30 -05:00
Brad King
625ce16244 Merge topic 'vs-link-defaults' into release-4.2
46e59b5168 Merge branch 'backport-vs-link-defaults' into vs-link-defaults
b6defd96c9 VS: Restore subsystem link flag for DLLs
91b9db90e5 VS: Restore subsystem link flag for DLLs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Overchenko <aleksandr9809@gmail.com>
Merge-request: !11524
2025-12-18 10:30:18 -05:00
Brad King
ff98528f42 Merge topic 'backport-vs-link-defaults' into release-4.1
91b9db90e5 VS: Restore subsystem link flag for DLLs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11524
2025-12-18 10:29:21 -05:00
Brad King
46e59b5168 Merge branch 'backport-vs-link-defaults' into vs-link-defaults 2025-12-17 17:42:10 -05:00
Brad King
b6defd96c9 VS: Restore subsystem link flag for DLLs
In commit 99d09ec45a (VS: Suppress MSBuild default link flags not
specified by project or user, 2025-06-17, v4.1.0-rc1~6^2) we removed our
default `-subsystem:...` link flag from `SHARED` and `MODULE` libraries
in Visual Studio generators for consistency with command-line generators.
However, unlike other flag suppressions for #27004, this change did not
just suppress MSBuild defaults, but actually changed flags the generator
was previously adding itself.

For the linker subsystem flag, consistency across generators should
perhaps achieved by adding the flag in other generators instead of
removing it from Visual Studio generators.  Restore the previous
behavior pending further investigation.

Issue: #27466
Fixes: #27464
2025-12-17 17:41:36 -05:00
Brad King
91b9db90e5 VS: Restore subsystem link flag for DLLs
In commit 99d09ec45a (VS: Suppress MSBuild default link flags not
specified by project or user, 2025-06-17, v4.1.0-rc1~6^2) we removed our
default `-subsystem:...` link flag from `SHARED` and `MODULE` libraries
in Visual Studio generators for consistency with command-line generators.
However, unlike other flag suppressions for #27004, this change did not
just suppress MSBuild defaults, but actually changed flags the generator
was previously adding itself.

For the linker subsystem flag, consistency across generators should
perhaps achieved by adding the flag in other generators instead of
removing it from Visual Studio generators.  Restore the previous
behavior pending further investigation.

Issue: #27466
Fixes: #27464
2025-12-17 17:41:17 -05:00
Brad King
ea357236f4 Help: Add 4.1 release note about VS link flag suppression
Document link flags suppressed by commit 99d09ec45a (VS: Suppress
MSBuild default link flags not specified by project or user, 2025-06-17,
v4.1.0-rc1~6^2).  Leave out `-subsystem` because that's being reverted
by another commit.

Issue: #27004
Issue: #27464
2025-12-17 16:58:30 -05:00