Commit Graph

71204 Commits

Author SHA1 Message Date
Brad King 5004602715 cmGlobalVisualStudio7Generator: Factor folder collection out of write method 2025-09-01 15:25:19 -04:00
Brad King 6ae4ed30d9 cmGlobalVisualStudio7Generator: Factor target collection out of write method 2025-09-01 15:25:18 -04:00
Brad King 5582eb292e cmGlobalVisualStudio7Generator: Update outdated comment 2025-09-01 15:25:18 -04:00
Brad King 2297ba9399 cmGlobalVisualStudio7Generator: Remove redundant C++ modules check
In commit 386465bf83 (cmTarget: add support for C++ module fileset
types, 2022-04-08, v3.25.0-rc1~624^2~7) we added two calls to the same
check in the VS generators.  Remove one.
2025-09-01 15:25:18 -04:00
Brad King ccbd61dd53 cmGlobalVisualStudio7Generator: Remove unused member 2025-09-01 15:25:18 -04:00
Brad King 93e34a5e0e cmGlobalGenerator: Constify GetTargetDirectDepends
It should only be called for targets whose dependencies are already
computed.
2025-09-01 15:25:18 -04:00
Brad King c07545b945 Tests/RunCMake/VS10Project: Enable case covering VS_SOLUTION_ITEMS
This was missed in commit 0bb13ba0e6 (VS: Add support for Visual Studio
solution items, 2024-10-27, v4.0.0-rc1~423^2).
2025-09-01 15:25:17 -04:00
Brad King ba8c4a15f1 CMake 4.1.1 v4.1.1 2025-08-27 12:33:28 -04:00
Brad King e0cd3b7e7d Merge topic 'cmList-swap-fix' into release-4.1
071e8678de cmList: fix swap function definition

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !11101
2025-08-27 10:53:22 -04:00
Brad King cf9cdde33d Merge topic 'vs7-generator-utility-target-typo' into release-4.1
93a83bcc00 cmGlobalVisualStudio7Generator: fix initialization typo

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11100
2025-08-27 10:48:13 -04:00
Brad King 7c169d5abb Merge branch 'release-4.0' into release-4.1 2025-08-27 10:42:09 -04:00
Brad King 18b3dd1e91 Merge topic 'ninja-many-subdirs' into release-4.1
6de40e7a4d Ninja: Fix regression with `.bat` wrapper around `ninja`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Acked-by: Josef Angstenberger <code@jtxa.de>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !11111
2025-08-27 10:40:10 -04:00
Brad King e81741a63e Merge topic 'ninja-many-subdirs' into release-4.0
6de40e7a4d Ninja: Fix regression with `.bat` wrapper around `ninja`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11111
2025-08-27 10:38:44 -04:00
Brad King 6de40e7a4d Ninja: Fix regression with .bat wrapper around ninja
Revise the change from commit 5a36d0c9e7 (Ninja: Fix regression with a
large number of subdirectories, 2025-03-04, v4.0.0-rc3~2^2) to use a
command-line length limit small enough for `.bat` files.

Fixes: #27153
2025-08-25 11:31:23 -04:00
Marc Chevrier 071e8678de cmList: fix swap function definition
swap function should be in the same namespace as the cmList class.

Reported by https://pvs-studio.com/en/blog/posts/cpp/1277/ (N1)

Issue: #27159
2025-08-21 17:19:52 +02:00
Ben Boeckel 93a83bcc00 cmGlobalVisualStudio7Generator: fix initialization typo
Typo introduced in b82a74d918 (generators: use GetSupportDirectory() in
more places, 2025-05-21) via !10812. Pointed out in a PVS-Studio blog
post.

See: https://pvs-studio.com/en/blog/posts/cpp/1277/ (N3)
2025-08-20 22:45:13 -04:00
Brad King d296bf6b70 Merge branch 'release-4.0' into release-4.1 2025-08-20 10:02:23 -04:00
Brad King 0ef525208c Merge topic 'ctest-T-test-timeout' into release-4.1
9dc3edbba8 ctest: Restore default test timeout for command-line `-T Test` step
8745e6308e ctest: Restore default of no time limit for command-line `-T Test` step

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11094
2025-08-20 10:01:00 -04:00
Brad King d0b490aaf0 Merge topic 'ctest-T-test-timeout' into release-4.0
9dc3edbba8 ctest: Restore default test timeout for command-line `-T Test` step
8745e6308e ctest: Restore default of no time limit for command-line `-T Test` step

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11094
2025-08-20 09:58:46 -04:00
Brad King 9dc3edbba8 ctest: Restore default test timeout for command-line -T Test step
In commit 774fcbe49c (CTest: Base command line mode on top of scripting
commands, 2024-10-05, v4.0.0-rc1~653^2) the implementation of this step
was converted to use `ctest_test` internally.  That command has its own
default test timeout of 600s if the ctest "TimeOut" configuration value
is not set.  If "TimeOut" is not set then default it to our previous
command-line mode default test timeout.

Fixes: #27139
2025-08-18 14:30:56 -04:00
Brad King 8745e6308e ctest: Restore default of no time limit for command-line -T Test step
Refactoring in commit 83845184db (cmCTest: Move timing functions from
cmCTestScriptHandler to cmCTest, 2024-10-23, v4.0.0-rc1~576^2) enabled a
time limit even if the undocumented `CTEST_TIME_LIMIT` script variable
is not set.
2025-08-18 14:10:15 -04:00
Brad King 8c9dd38e7f Merge branch 'release-4.0' into release-4.1 2025-08-15 08:28:35 -04:00
Brad King fc41d4e3f6 Merge topic 'clang_cuda_support_cuda_13' into release-4.1
67c102ef64 Clang/CUDA: Support CUDA Toolkit 13 new include layout

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11079
2025-08-15 08:27:46 -04:00
Brad King 7af0e010ba Merge branch 'release-3.31' into release-4.0 2025-08-15 08:26:59 -04:00
Brad King 75679c169d Merge topic 'clang_cuda_support_cuda_13' into release-4.0
67c102ef64 Clang/CUDA: Support CUDA Toolkit 13 new include layout

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11079
2025-08-15 08:26:32 -04:00
Brad King bb97311b4a Merge topic 'clang_cuda_support_cuda_13' into release-3.31
67c102ef64 Clang/CUDA: Support CUDA Toolkit 13 new include layout

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11079
2025-08-15 08:25:35 -04:00
Robert Maynard 67c102ef64 Clang/CUDA: Support CUDA Toolkit 13 new include layout
This ensures that clang knows about the two includes that are required for CUDA 13.
2025-08-14 09:55:53 -04:00
Brad King 4445478ef7 Merge topic 'pkgc-import-system-fix' into release-4.1
d5f6cf5ba8 PkgC: Only remove system paths which are exact matches
93f77d8183 PkgC: Allow system paths during IMPORT, POPULATE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !11078
2025-08-14 09:22:47 -04:00
Brad King 8fbddbc777 Merge topic 'genex-strip-nested' into release-4.1
8227028e49 string(GENEX_STRIP): Fix regression on nested generator expressions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11077
2025-08-14 09:20:08 -04:00
Brad King 14665de371 Merge topic 'stdio-terminal' into release-4.1
914803bf31 Makefile: Fix regression that prints unnecessary VT100 escape sequences
a0a9e48f85 StdIo: Fix Terminal abstraction to avoid unnecessary VT100 escape sequences

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11080
2025-08-14 09:18:13 -04:00
Martin Duffy 8227028e49 string(GENEX_STRIP): Fix regression on nested generator expressions
Since commit 13c7bb5b0c (cmGeneratorExpression: Update strip function to
collect parsed expressions, 2025-04-08), the logic to strip generator
expressions from a string made incorrect assumptions about the contents of
generator expressions, leading certain cases to be stripped incorrectly.

Clean up the logic and fix broken behavior, and add test coverage with
`string(GENEX_STRIP)`.

Fixes: #27133
2025-08-13 15:52:16 -04:00
Brad King 914803bf31 Makefile: Fix regression that prints unnecessary VT100 escape sequences
Since commit 509c424472 (StdIo: Replace uses of KWSys Terminal with
StdIo::Print, 2025-05-08, v4.1.0-rc1~151^2~2) we print unnecessary VT100
escape sequences to establish normal text even when not intending to
print color.  In combination with `CLICOLOR_FORCE=1`, this breaks
detection of implicit link information from compiler driver output.

Fixes: #27137
2025-08-13 15:30:25 -04:00
Brad King a0a9e48f85 StdIo: Fix Terminal abstraction to avoid unnecessary VT100 escape sequences
Fix commit 329d755dbd (StdIo: Add a Terminal abstraction to print color
text, 2025-05-06, v4.1.0-rc1~151^2~3) to avoid printing a VT100 escape
sequence for normal text if we did not print any sequence initially.
We already use this approach for Windows Console text attributes.

Issue: #26924
2025-08-13 15:30:24 -04:00
Vito Gamberini d5f6cf5ba8 PkgC: Only remove system paths which are exact matches 2025-08-13 12:59:00 -04:00
Vito Gamberini 93f77d8183 PkgC: Allow system paths during IMPORT, POPULATE
Fixes: #27138
2025-08-13 11:57:09 -04:00
Brad King 2a2c2e0b26 CMake 4.1.0 v4.1.0 2025-08-05 10:55:57 -04:00
Brad King e8ea1b3164 Merge topic 'update-kwiml' into release-4.1
e936fa9036 Merge branch 'upstream-KWIML' into update-kwiml
1ec3395200 KWIML 2025-08-05 (2eae04db)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11024
2025-08-05 10:50:14 -04:00
Brad King a300f1450e Merge topic 'rcc-only-pass-no-zstd-qt6' into release-4.1
aeae5ede92 Autogen/RCC: Only pass --no-zstd to Qt6

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11013
2025-08-05 10:26:51 -04:00
Brad King 0ade171bce Merge branch 'release-4.0' into release-4.1 2025-08-05 09:58:52 -04:00
Brad King 68da4d6100 Merge topic 'cuda_13_support' into release-4.1
3ff777de12 CUDA: Update CUDA tests to handle CUDA 13 deprecations
bbf732525a CUDA: Add CUDA 13.0 support to 'all' and 'all-major' architecture tables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11015
2025-08-05 09:57:59 -04:00
Brad King 21c0a92bd2 Merge topic 'cuda_ensure_arch_order' into release-4.1
8beb309b79 CUDA: Make sure CUDA architectures are in order

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11014
2025-08-05 09:55:46 -04:00
Brad King afc5d693dc Merge branch 'release-3.31' into release-4.0 2025-08-05 09:54:05 -04:00
Brad King 58fd8667a5 Merge topic 'qcc-8-cxx-lang-flag' into release-4.1
ea3280f15b Merge branch 'qcc-8-cxx-lang-flag-3.31' into qcc-8-cxx-lang-flag
166061629a QCC-CXX: use `-x c++` on 8+
dc7adb64f3 QCC-CXX: use `-x c++` on 8+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10992
2025-08-05 09:53:50 -04:00
Brad King f9af4e50c4 Merge topic 'cuda_13_support' into release-4.0
3ff777de12 CUDA: Update CUDA tests to handle CUDA 13 deprecations
bbf732525a CUDA: Add CUDA 13.0 support to 'all' and 'all-major' architecture tables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11015
2025-08-05 09:53:41 -04:00
Brad King 388971557e Merge topic 'cuda_13_support' into release-3.31
3ff777de12 CUDA: Update CUDA tests to handle CUDA 13 deprecations
bbf732525a CUDA: Add CUDA 13.0 support to 'all' and 'all-major' architecture tables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11015
2025-08-05 09:52:56 -04:00
Brad King 1ff9ebe222 Merge topic 'cuda_ensure_arch_order' into release-4.0
8beb309b79 CUDA: Make sure CUDA architectures are in order

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11014
2025-08-05 09:52:16 -04:00
Brad King 2853f1c3d1 Merge topic 'cuda_ensure_arch_order' into release-3.31
8beb309b79 CUDA: Make sure CUDA architectures are in order

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11014
2025-08-05 09:51:43 -04:00
Brad King 9c1123a3c4 Merge topic 'qcc-8-cxx-lang-flag' into release-4.0
166061629a QCC-CXX: use `-x c++` on 8+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10992
2025-08-05 09:50:00 -04:00
Brad King 8a6a6e138c Merge topic 'qcc-8-cxx-lang-flag' into release-3.31
166061629a QCC-CXX: use `-x c++` on 8+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10992
2025-08-05 09:49:15 -04:00
Brad King e936fa9036 Merge branch 'upstream-KWIML' into update-kwiml
# By KWIML Upstream
* upstream-KWIML:
  KWIML 2025-08-05 (2eae04db)
2025-08-05 09:36:40 -04:00