40304 Commits
Author SHA1 Message Date
Kitware Robot abf5a58ecc CMake Nightly Date Stamp 2026-09-24 00:05:26 -04:00
Brad King f4e378278b Merge topic 'cmp0181-trycompile-policy-order'
5e52f92a2a try_compile: Add support for toolchain files to query CMP0181

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12540
2026-09-23 13:47:31 -04:00
Brad King bb13ddbfe1 Merge topic 'install-name-dir-no-separator-conversion'
726e6454b5 Ninja,Makefile: Do not convert separators in the install-name directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12530
2026-09-23 13:46:15 -04:00
Brad King 2975be1a6b Merge topic 'procmetrics-command-chain'
1528113bdf instrumentation: Prevent inherited process metrics in chained commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12513
2026-09-23 13:40:51 -04:00
Brad King 6498b76d61 Merge topic 'reduce-realloc-clang-tidy-part3'
0aa1eaf506 Source: Reduce string allocations, part 4
1d2f0120be Source: Reduce string allocations, part 3
cb20c5bd89 Source: Reduce string allocations, part 2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12538
2026-09-23 13:30:55 -04:00
Brad King a399d4c1ea Merge topic 'install-TARGETS-RUNTIME_DEPENDENCY_TARGETS'
53019cd2e6 install(TARGETS): Add option to install runtime deps built as other targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12483
2026-09-23 13:22:51 -04:00
Brad King 356af0e38a Merge topic 'capabilities-instrumentation'
a2643a6db6 instrumentation: Add instrumentation version to cmake -E capabilities

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Tyler Yankee <tyler.yankee@kitware.com>
Merge-request: !12536
2026-09-23 11:41:20 -04:00
Brad King c957150f3e Merge topic 'swift-imported-include-fix'
a3ff10a963 Xcode: Propagate system include directories to Swift compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12542
2026-09-23 09:51:54 -04:00
Kitware Robot de8a69ce2d CMake Nightly Date Stamp 2026-09-23 00:05:37 -04:00
Florent Castelli 726e6454b5 Ninja,Makefile: Do not convert separators in the install-name directory
The Ninja and Makefile generators passed the install-name directory of a
shared library (`@rpath/` by default, or `INSTALL_NAME_DIR`) through
`ConvertToOutputFormat(SHELL)`.  That converts directory separators for
the host shell, so a Windows host cross-compiling for macOS wrote
`-install_name @rpath\libfoo.dylib`.  The install name is not a host
path: it is embedded in the Mach-O load command and read by dyld on the
target, where a backslash never matches anything.

Escape the value for the shell without converting separators, in both
generators.  Add a test to each that fakes an install-name platform and
checks the generated build files keep the forward slashes.

Fixes: #28104
2026-09-22 14:29:50 -04:00
jcm a3ff10a963 Xcode: Propagate system include directories to Swift compiler
Previously, only non-system include directories would be propagated to
Swift. This meant that if, for example, an IMPORTED target contained a
Swift module, that module would not be found by a Swift consumer.

Fixes: #28097
2026-09-22 12:31:00 -05:00
Brad King 5e52f92a2a try_compile: Add support for toolchain files to query CMP0181
Follow the approach from commit 92320466dd (try_compile: Restore
platform-default link flags in pre-CMP0210 projects, 2026-08-22)
to make the CMP0181 policy setting available in `try_compile`
projects before the toolchain file is loaded.

Fixes: #28108
2026-09-22 11:35:05 -04:00
Stepanov Igor 53019cd2e6 install(TARGETS): Add option to install runtime deps built as other targets
Add a `RUNTIME_DEPENDENCY_TARGETS` option for `install(TARGETS)`
to automatically install the necessary runtime shared libraries.

Closes: #23505
2026-09-22 10:40:52 -04:00
Brad King ec85176fbe Merge topic 'if-RULE-operator'
d4dc18c01b if() command: add RULE operator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !12529
2026-09-22 10:16:47 -04:00
Brad King d37a1fc335 Merge topic 'automoc-predefs-msvc'
7c3ca57b91 MSVC,Clang: Set CMAKE_CXX_COMPILER_PREDEFINES_COMMAND for the MSVC ABI
0fd711348c Autogen: Pass WIN32 to moc when targeting the MSVC ABI
4a4a654814 Autogen: Keep stderr out of the generated moc_predefs.h
1c1258ad95 cmWorkerPool: Allow capturing process stderr separately

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !12517
2026-09-22 10:14:46 -04:00
Brad King 6e1b603032 Merge topic 'cmctg-launcher-vector-cleanup'
721eb8a5a2 cmCommonTargetGenerator: Improve launcher shell conversion
bf1a2de409 cmCommonTargetGenerator: Improve style

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12528
2026-09-22 10:08:26 -04:00
Brad King 2020c66db9 Merge topic 'ctest-fixture-repeat'
5cced02b9d CTest: Repeat test fixtures with the tests that require them
4fcf3dd296 CTest: Ignore a checkpoint entry for a test that is not pending
32b25b94d6 CTest: Track one run number for a repeating test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !11638
2026-09-22 10:01:43 -04:00
Brad King 7bf7964905 Merge topic 'emit_deprecate_wawrning_on_h_cmd_arg'
00388f8576 cmake-cli: Deprecate -H

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12520
2026-09-22 09:55:26 -04:00
Martin Duffy 1528113bdf instrumentation: Prevent inherited process metrics in chained commands
Shells may exec the final chained command instead of forking it,
preserving resource usage accumulated from earlier children.

When processMetrics is enabled, append a shell builtin to generated
command chains and scripts for Ninja, Makefiles, and FASTBuild to prevent
this optimization while preserving command exit status.
2026-09-22 09:36:44 -04:00
Martin Duffy a2643a6db6 instrumentation: Add instrumentation version to cmake -E capabilities 2026-09-22 08:39:58 -04:00
AJIOB 0aa1eaf506 Source: Reduce string allocations, part 4 2026-09-22 11:37:41 +03:00
AJIOB 1d2f0120be Source: Reduce string allocations, part 3 2026-09-22 11:37:41 +03:00
AJIOB cb20c5bd89 Source: Reduce string allocations, part 2 2026-09-22 11:37:41 +03:00
Kitware Robot 509ac6160a CMake Nightly Date Stamp 2026-09-22 00:06:57 -04:00
Robert Maynard 00388f8576 cmake-cli: Deprecate -H
Fixes: #18341
2026-09-21 14:35:51 -04:00
Tyler Yankee 721eb8a5a2 cmCommonTargetGenerator: Improve launcher shell conversion
Encapsulate the shell escaping logic in `cmCommonTargetGenerator` and
represent launchers via a vector of strings (as is done with custom
commands, execute process commands, etc.) to make them easier to work
with.

This facilitates work in a future commit which will reuse this pathway.

Issue: #27598, #27402
2026-09-21 13:45:54 -04:00
Brad King 106b5b5fd7 Merge topic 'cmp0210-trycompile-policy-order'
af7a370bf1 Merge branch 'backport-4.3-cmp0210-trycompile-policy-order'
92320466dd try_compile: Restore platform-default link flags in pre-CMP0210 projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12525
2026-09-21 13:41:59 -04:00
Marc Chevrier d4dc18c01b if() command: add RULE operator 2026-09-21 18:10:48 +02:00
Tyler Yankee bf1a2de409 cmCommonTargetGenerator: Improve style 2026-09-21 11:55:37 -04:00
Brad King af7a370bf1 Merge branch 'backport-4.3-cmp0210-trycompile-policy-order' 2026-09-21 11:47:20 -04:00
Brad King c512ae97ce Merge topic 'custom-rule-support'
386d1d874c Add support of custom rules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !12361
2026-09-21 11:40:22 -04:00
Mickaël Germain 92320466dd try_compile: Restore platform-default link flags in pre-CMP0210 projects
The CMP0210 compatibility shims in the Darwin, AIX, HP-UX and ARMClang
modules read the policy with cmake_policy(GET CMP0210 ...) during
enable_language(), which runs inside project().  cmCoreTryCompile emitted
cmake_policy(SET CMP0210 ...) after project() in the generated test
project, so those shims always observed NEW regardless of the calling
project's setting.

On affected platforms this dropped the platform default link flags from
every try_compile, and left a toolchain-file value of
CMAKE_<LANG>_LINK_FLAGS unclobbered so that it reached the OLD code path.
For projects that are also not using CMP0181 NEW, that path uses the
variable as is and does not expand the LINKER: prefix.

Move the emission into the existing pre-project() policy block alongside
CMP0126, CMP0128 and CMP0197, which exist for exactly this reason.

Fixes: #28102
2026-09-21 11:35:38 -04:00
Brad King 0b9b66d056 Merge topic 'test-langs-launchers'
584a9297c0 CUDA, HIP: Restore support for LINKER_LAUNCHER
aeb7c3295d Merge branch 'backport-test-langs-launchers' into test-langs-launchers
b63bcda722 CUDA, HIP: Revert false support for LINKER_LAUNCHER

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !12519
2026-09-21 11:28:32 -04:00
Kitware Robot 916ff39d46 CMake Nightly Date Stamp 2026-09-21 00:05:58 -04:00
Marc Chevrier 386d1d874c Add support of custom rules
Fixes: #27383
2026-09-20 11:43:10 +02:00
Kitware Robot 7003e53f72 CMake Nightly Date Stamp 2026-09-20 00:05:38 -04:00
Kitware Robot 8683efde41 CMake Nightly Date Stamp 2026-09-19 00:05:32 -04:00
Taylor Braun-JonesandTyler Yankee 5cced02b9d CTest: Repeat test fixtures with the tests that require them
When ctest repeats tests with its --repeat option, it repeats each test
on its own.  A fixture's setup and cleanup tests therefore run all of
their repetitions back to back, and the tests they bracket repeat inside
a single setup/cleanup pair:

  setup -> setup -> test -> test -> cleanup -> cleanup

Add a FIXTURE_REPEAT_MODE test property to select how a fixture behaves
when its tests are repeated:

* AROUND_ALL_REPEATS: the fixture runs once, around all repetitions of
  the tests requiring it.
* AROUND_EACH_REPEAT: the fixture and the tests requiring it repeat
  together, so every repetition gets a fresh setup and its own cleanup.
* EACH_TEST_SEPARATELY: every test repeats on its own, as before.

The property describes the fixture rather than the test carrying it, so
setting it on any one of a fixture's setup or cleanup tests is enough.

In AROUND_EACH_REPEAT mode the tests of a fixture form a repeat group that
ctest re-queues as a whole once every test in it has finished.  The --repeat
condition then applies to the group the way it applies to an individual
test: until-fail repeats while the whole group passes, until-pass repeats
while any of it does not, and after-timeout repeats while any of it times
out.  Fixtures that share a test repeat together, so a test requiring two of
them still runs once per repetition.

A group is recorded the way a repeating test is: only once it stops
repeating, and with the results of its last repetition.  A group that
until-pass makes pass therefore reports a pass rather than the failure that
made it repeat, a test that DEPENDS on one of the group's tests waits for
the last repetition rather than the first, and `ctest -F` resumes an
interrupted group by running it again from the beginning.

Fixtures that repeat together have to agree on the mode: a test cannot
repeat with one fixture but not with another it takes part in, and a fixture
whose setup and cleanup tests disagree has no coherent behavior.  Report an
error and run nothing in those cases rather than pick an order in which a
test repeats after a fixture it requires has been cleaned up.

Add policy CMP0224 to select AROUND_EACH_REPEAT as the default for fixtures
whose setup and cleanup tests choose no mode themselves.  Record the mode
the policy chose in the generated test file under its own
_CMAKE_DEFAULT_FIXTURE_REPEAT_MODE keyword, so that ctest reads a mode
rather than the policy settings behind it, and so that a mode requested on
one of a fixture's tests wins over the default recorded for its siblings.
Only NEW needs recording: with nothing recorded, ctest already uses the
behavior of CMake 4.4 and below.  Fixtures are common, and the choice of
mode matters only to those who run ctest --repeat, so warn about the unset
policy only when the CMAKE_POLICY_WARNING_CMP0224 variable asks for it.

discover_tests() and gtest_discover_tests() create their tests while ctest
runs or at build time, too late for the policy to reach them, so carry the
setting in effect at their call sites through to the tests they create.

Report the repetition a grouped test belongs to in the "(run N/M)" suffix
of its "Start" line, as ctest already does for a test repeating on its own.

Co-authored-by: Tyler Yankee <tyler.yankee@kitware.com>
Fixes: #21438
2026-09-18 08:29:28 -04:00
Taylor Braun-Jones 4fcf3dd296 CTest: Ignore a checkpoint entry for a test that is not pending
CheckResume() reads the checkpoint `ctest -F` resumes from and removes each
test it names.  RemoveTest() erased the iterator std::find returned without
checking it, so a checkpoint naming a test the current run does not have
pending -- one written before the test list changed, say -- erased the end
iterator of a std::list, which is undefined behavior.  Skip such an entry
instead.
2026-09-18 08:28:42 -04:00
Taylor Braun-Jones 32b25b94d6 CTest: Track one run number for a repeating test
cmCTestRunTest counted the repetitions of a test with two members whose
meaning overlapped: how many runs were left, and how many there were in
total.  The "(run N/M)" suffix then had to recover N by subtracting one
from the other, and the rule deciding which run prints the "completed/total"
prefix read as a pair of conditions on the remaining count.

Count up instead.  Keep the number of the run being made and the number of
runs the test may be given, and let the rule say which run the prefix
belongs to.
2026-09-18 08:28:41 -04:00
Brad King 670f62d10d Merge topic 'cmake_path-empty-prefix'
7192a2b798 cmake_path: An empty path is not a prefix of any path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12493
2026-09-18 08:16:12 -04:00
Brad King 6016b9d793 Merge topic 'fortran-preprocess-upper'
ff39abb378 Fortran: Teach lexer about Intel's upper-case preprocessor directives

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12521
2026-09-18 08:14:20 -04:00
Brad King f9ae489598 Merge topic 'cdash-instrumentation-proc-metrics'
01fa1984e5 instrumentation: Send processMetrics data to CDash
68e2a3e793 instrumentation: Rename userTime and systemTime fields to exclude units

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Tyler Yankee <tyler.yankee@kitware.com>
Merge-request: !12514
2026-09-18 08:11:50 -04:00
Brad King fb4bab8ee5 Merge topic 'ninja-codegen-deps-fix'
2d85779126 Ninja: Account for explicit target dependencies via CODEGEN

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12512
2026-09-18 08:07:25 -04:00
Brad King 6f03832272 Merge topic 'install-args-move'
789138ae3d install(TARGETS): Avoid copying command arguments internally

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12516
2026-09-18 08:04:20 -04:00
Brad King ab46a992e5 Merge topic 'ctest-dashboard-preset-env'
27f28db197 Help: Clarify CTEST_NO_TESTS_ACTION support and interaction
a235560e53 Help: Clarify interaction between CTest parallelism toggles
f745dd11ab ctest: Respect test envvars set by CTEST_PRESET
277236a99a cmCTestTestCommand: Factor out preset resolution
81b46d87ba cmCTest: Factor out environment variable handling
4e81913645 Tests: Fix unset(ENV{...}) typos

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !12495
2026-09-18 07:59:56 -04:00
Joerg Bornemann 0fd711348c Autogen: Pass WIN32 to moc when targeting the MSVC ABI
WIN32 was added to the moc definitions only when no moc_predefs.h was
generated, as of commit 5f0f84c7e0 (Autogen: Don't add a WIN32 moc
definition if we have a moc_predefs.h file, 2018-11-27,
v3.14.0-rc1~298^2). For the MSVC ABI that is not enough: WIN32 comes
from our default Windows flags rather than from the compiler, so a
generated moc_predefs.h does not carry it either.

Keep the existing fallback for the other toolchains. GCC predefines
WIN32 on Windows, but only with the GNU dialects, so injecting it
unconditionally would make moc disagree with a strict ISO compile.

Issue: #28093
2026-09-18 11:34:49 +02:00
Joerg Bornemann 4a4a654814 Autogen: Keep stderr out of the generated moc_predefs.h
The stdout of CMAKE_CXX_COMPILER_PREDEFINES_COMMAND is written to
moc_predefs.h verbatim, so whatever the command prints on stderr must
not be mixed in. MSVC-like compilers echo the name of the source file
they preprocess. Run the job with separate streams and report both
streams when the command fails.

Issue: #28093
2026-09-18 11:34:49 +02:00
Joerg Bornemann 1c1258ad95 cmWorkerPool: Allow capturing process stderr separately
JobT::RunProcess always merged the process stderr into
ProcessResultT::StdOut. That is fine for jobs that only log the output,
but not for jobs that consume stdout as data. Add a mergedOutput
parameter that defaults to the previous behavior.

Issue: #28093
2026-09-18 11:34:49 +02:00
Kitware Robot 08bde1b972 CMake Nightly Date Stamp 2026-09-18 00:06:46 -04:00