Commit Graph
76362 Commits
Author SHA1 Message Date
Brad King e0c02bc3cf Merge branch 'release-4.4' 2026-07-08 09:21:14 -04:00
Brad King c5cd9f315c Merge branch 'release-4.3' 2026-07-08 09:21:08 -04:00
Brad King 1c5ddf23e8 Merge branch 'release-4.2' 2026-07-08 09:21:02 -04:00
Brad King 83587bc93c Merge branch 'release-4.1' 2026-07-08 09:20:57 -04:00
Brad King bb780342ef Merge branch 'release-4.3' into release-4.4 2026-07-08 09:20:49 -04:00
Brad King 4cb3c34d4a Merge branch 'release-4.4' 2026-07-08 09:19:52 -04:00
Brad King e81dc7020a Merge topic 'fix-cmp0194-policy-warning'
895f83d019 Merge branch 'backport-4.2-fix-cmp194-policy-warning'
e733da51ba CMP0194: Fix policy number in warning text
b88cade899 Merge branch 'backport-4.1-fix-cmp194-policy-warning'
26681a69d2 CMP0194: Fix policy number in warning text
2eb1361cc2 CMP0194: Fix policy number in warning text

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12252
2026-07-08 09:19:52 -04:00
Brad King 927b30fdab Merge topic 'fix-cmp0194-policy-warning' into release-4.4
895f83d019 Merge branch 'backport-4.2-fix-cmp194-policy-warning'
e733da51ba CMP0194: Fix policy number in warning text
b88cade899 Merge branch 'backport-4.1-fix-cmp194-policy-warning'
26681a69d2 CMP0194: Fix policy number in warning text
2eb1361cc2 CMP0194: Fix policy number in warning text

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12252
2026-07-08 09:19:50 -04:00
Brad King 316c0202de Merge branch 'release-4.2' into release-4.3 2026-07-08 09:19:29 -04:00
Brad King fd02c41edb Merge topic 'backport-4.2-fix-cmp194-policy-warning' into release-4.3
b88cade899 Merge branch 'backport-4.1-fix-cmp194-policy-warning'
26681a69d2 CMP0194: Fix policy number in warning text
2eb1361cc2 CMP0194: Fix policy number in warning text

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12252
2026-07-08 09:19:09 -04:00
Brad King deafeea525 Merge branch 'release-4.1' into release-4.2 2026-07-08 09:18:50 -04:00
Brad King 10f88991a2 Merge topic 'backport-4.2-fix-cmp194-policy-warning' into release-4.2
b88cade899 Merge branch 'backport-4.1-fix-cmp194-policy-warning'
26681a69d2 CMP0194: Fix policy number in warning text
2eb1361cc2 CMP0194: Fix policy number in warning text

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12252
2026-07-08 09:18:26 -04:00
Brad King 75f01b856a Merge topic 'backport-4.1-fix-cmp194-policy-warning' into release-4.1
2eb1361cc2 CMP0194: Fix policy number in warning text

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12252
2026-07-08 09:17:03 -04:00
Brad King 19eb479b92 Merge topic 'test-compile-warning-as-error'
3df7dd2a12 Tests: Teach RunCMake.CompileWarningAsError to tolerate `-w` in environment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12254
2026-07-08 09:16:35 -04:00
Kitware Robot 609e04b25e CMake Nightly Date Stamp 2026-07-08 00:05:35 -04:00
Brad King 895f83d019 Merge branch 'backport-4.2-fix-cmp194-policy-warning' 2026-07-07 15:58:57 -04:00
Jocó Mihalicza e733da51ba CMP0194: Fix policy number in warning text 2026-07-07 15:58:19 -04:00
Brad King 3df7dd2a12 Tests: Teach RunCMake.CompileWarningAsError to tolerate -w in environment 2026-07-07 15:50:24 -04:00
Brad King b88cade899 Merge branch 'backport-4.1-fix-cmp194-policy-warning' 2026-07-07 15:28:19 -04:00
Jocó Mihalicza 26681a69d2 CMP0194: Fix policy number in warning text 2026-07-07 15:27:41 -04:00
Jocó Mihalicza 2eb1361cc2 CMP0194: Fix policy number in warning text 2026-07-07 15:23:06 -04:00
Brad King 04b2dfd8be Merge topic 'changing-toolchain-recover'
ca3d1007f0 Tests: Simplify RunCMake.CompilerChange
ca0bf9848d cmake: Retain cache from presets and command line before re-configure
ee6bfdc1f3 CMAKE_TOOLCHAIN_FILE: Improve recovery from changed compiler or toolchain file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12241
2026-07-07 11:12:13 -04:00
Brad King 3765645365 Merge topic 'ctest-stdio-colors'
fd395b25b5 ctest: Improve colorization in output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !12243
2026-07-07 11:00:30 -04:00
Brad King e7f51ac214 Merge branch 'release-4.4' 2026-07-07 10:47:45 -04:00
Brad King abbf8adfd5 Merge topic 'doc-component-indent'
273c414ece Help: Dedent multiple install `--component`s note

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12244
2026-07-07 10:47:45 -04:00
Brad King f0c892d572 Merge topic 'doc-component-indent' into release-4.4
273c414ece Help: Dedent multiple install `--component`s note

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12244
2026-07-07 10:47:43 -04:00
Kitware Robot 57d51681e2 CMake Nightly Date Stamp 2026-07-07 00:08:57 -04:00
Kitware Robot b20e5a8661 CMake Nightly Date Stamp 2026-07-06 00:05:09 -04:00
Kitware Robot 7dc7836c59 CMake Nightly Date Stamp 2026-07-05 00:06:15 -04:00
Kitware Robot 40277a12b8 CMake Nightly Date Stamp 2026-07-04 00:05:02 -04:00
Aiden Woodruff ca3d1007f0 Tests: Simplify RunCMake.CompilerChange
The test suite can be simplified now that command line arguments are
restored after resetting the cache due to a compiler change. Previously
the test case name had to be set in the environment and now that is not
required.
2026-07-03 10:20:20 -04:00
Tyler Yankee fd395b25b5 ctest: Improve colorization in output
Refactor CTest's logging to replace custom color code handling with the
infrastructure introduced in commit 329d755dbd (StdIo: Add a Terminal
abstraction to print color text, 2025-05-06).

Avoid ANSI escape sequences in files passed to `--output-log-file`.

Fixes: #27915
2026-07-03 10:02:43 -04:00
Aiden Woodruff ca0bf9848d cmake: Retain cache from presets and command line before re-configure
Triggering a cache reset and re-configure by changing the compiler or
CMAKE_TOOLCHAIN_FILE should be a shortcut for cmake --fresh. Losing the
cache variables from the command line and especially presets can have an
unexpected effect. This commit restores the preset cache variables and
reprocesses cache-affecting variables from the immediate command line.

Fixes: #27899
2026-07-03 10:00:16 -04:00
Aiden Woodruff ee6bfdc1f3 CMAKE_TOOLCHAIN_FILE: Improve recovery from changed compiler or toolchain file
Replace __CMAKE_DELETE_CACHE_CHANGE_VARS_ with a set of changed
variables in cmState to avoid interference from scripts and simplify
handling of changed variables.

Errors during configure step will block re-configure when the toolchain
file has changed. Downstream errors can be caused by failing in
EnableLanguage without an error, behavior introduced in 7a989ed58a
(CMAKE_TOOLCHAIN_FILE: Detect path changes and reset cache, 2026-06-24).
Errors directly related to a changed toolchain file should be fixed by
using the new one.

Trigger a fatal error when the toolchain file change is detected to
avoid wasteful configure that will be reset anyway, then re-configure
only for that specific case. Avoid re-configuring multiple times.

Fixes: #27867
2026-07-03 09:25:33 -04:00
Brad King 1514097505 Merge branch 'release-4.4' 2026-07-03 09:24:26 -04:00
Brad King 04c04c85f1 Merge topic 'tcl-9'
b4534a9b7c Find{TCL,Tclsh,TclStub,Wish}: Add support for Tcl/Tk 9.0 & 9.1
7ab991f5b6 Find{TCL,Tclsh,TclStub}: Remove matches for non-existent Tcl/Tk 8.7
df0671701e Find{TCL,Tclsh,TclStub,Wish}: Remove outdated Windows registry searches

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12232
2026-07-03 09:24:26 -04:00
Brad King 9472f0eba7 Merge topic 'tcl-9' into release-4.4
b4534a9b7c Find{TCL,Tclsh,TclStub,Wish}: Add support for Tcl/Tk 9.0 & 9.1
7ab991f5b6 Find{TCL,Tclsh,TclStub}: Remove matches for non-existent Tcl/Tk 8.7
df0671701e Find{TCL,Tclsh,TclStub,Wish}: Remove outdated Windows registry searches

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12232
2026-07-03 09:24:24 -04:00
Brad King 793899c888 Merge topic 'test-trace-json-time'
fa201d3cff Tests: Fix `cmake --trace=json-v1` test expectation for integer time

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12240
2026-07-03 09:21:05 -04:00
Tyler Yankee 273c414ece Help: Dedent multiple install --components note 2026-07-03 09:09:59 -04:00
Kitware Robot e442f2b766 CMake Nightly Date Stamp 2026-07-03 00:05:02 -04:00
Brad King fa201d3cff Tests: Fix cmake --trace=json-v1 test expectation for integer time
Extend the `time` field check from commit c829f0cfca (trace: Add time
and stack level to JSON output format, 2020-01-20, v3.17.0-rc1~105^2) to
accept a timestamp that happens to be formatted as an exact integer.
2026-07-02 08:07:40 -04:00
Brad King db58e5fbd6 Merge topic 'compile-trace-rsp'
89b1e21a5e instrumentation: Gather compile trace files in compile rsp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !12238
2026-07-02 08:03:06 -04:00
Brad King f2001c745f Merge topic 'target-types'
f1d7bedc4b TargetTypes: Improve use of imported target scope type
a5a9ec9113 TargetTypes: Extract target-related types to dedicated header

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !12236
2026-07-02 08:00:51 -04:00
Brad King e037d3bd2b Merge topic 'xc_cmd_comment'
de28f37ce4 Xcode: Propagate add_custom_command COMMENT to generated projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !12237
2026-07-02 07:58:02 -04:00
Brad King 9e156752be Merge topic 'regenerate-presets-py-support-utf-8'
7e319339b8 Presets: Teach regenerate-presets.py to support UTF-8 text

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Tyler Yankee <tyler.yankee@kitware.com>
Merge-request: !12239
2026-07-02 07:56:10 -04:00
FeRD (Frank Dana) b4534a9b7c Find{TCL,Tclsh,TclStub,Wish}: Add support for Tcl/Tk 9.0 & 9.1
Tcl/Tk 9.0.0 was released[1] in 2024, and is already up to version
9.0.4 (just released 2026-07-26).

Tcl/Tk 9.1 is currently nearing beta,[2] and will likely release soon.

Since it's still possible to have both of these libraries installed
without Tclsh or Wish (making version detection via those tools
unviable), add 9.0 and 9.1 variants to the explicit library/include
path and file matches performed by FindTCL.

Also add 9.0 and 9.1 patterns to the tool detections in FindTclsh,
FindTclStub, and FindWish.

[1]: https://sourceforge.net/projects/tcl/files/Tcl/9.0.0/
[2]: https://sourceforge.net/projects/tcl/files/Tcl/9.1b0/
2026-07-02 06:58:58 -04:00
FeRD (Frank Dana) 7ab991f5b6 Find{TCL,Tclsh,TclStub}: Remove matches for non-existent Tcl/Tk 8.7
Version 8.7 of Tcl/Tk never made it past alpha status.
What was briefly labeled 8.7a5 eventually released as 9.0.0.

And in FindTclStub, also remove patterns for ttkstub8.8, which
even more than 8.7 never actually existed.
2026-07-02 06:58:01 -04:00
Brad King df0671701e Find{TCL,Tclsh,TclStub,Wish}: Remove outdated Windows registry searches
Installers from "Scriptics" have not been available for many years.

Issue: #27914
Reported-by: FeRD (Frank Dana) <ferdnyc@gmail.com>
2026-07-02 06:57:33 -04:00
Kitware Robot be0c7fd314 CMake Nightly Date Stamp 2026-07-02 00:05:36 -04:00
Matthew Woehlke f1d7bedc4b TargetTypes: Improve use of imported target scope type
Move `ImportedTargetScope` to `cmTargetTypes.h`, enabling it to be used
without dragging in all of `cmMakefile.h`. Use this in more places
instead of `bool global`.
2026-07-01 14:44:11 -04:00