mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 22:31:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
71,183 Commits 2 Branches 401 Tags
8c9dd38e7fa3d80e89dadd6b67f5c0d0bc015d80
Commit Graph

71183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
KWIML Upstream 1ec3395200 KWIML 2025-08-05 (2eae04db) 
Code extracted from:

    https://gitlab.kitware.com/utils/kwiml.git

at commit 2eae04db635472d14c9e18b96c5297c0257c9925 (master).

Upstream Shortlog
-----------------

Brad King (1):
      2eae04db cmake: Require 3.13 and enable policies through 4.0

Verney7 (1):
      056a6c62 abi.h: Add sw_64 support
 2025-08-05 09:36:39 -04:00
Heiko Becker aeae5ede92 Autogen/RCC: Only pass --no-zstd to Qt6 
In commit 9e87df4d46 (Autogen/RCC: Disable zstd if it is not supported,
2024-02-08, v3.29.0-rc1~5^2) we added this flag, but it doesn't exist
for Qt 5.  It was only introduced with qtbase commit `14546d1816a8`,
which first appeared in Qt 6.

Fixes: #27111
Issue: #25664
 2025-08-04 13:45:14 -04:00
Robert Maynard 3ff777de12 CUDA: Update CUDA tests to handle CUDA 13 deprecations 2025-08-04 11:22:13 -04:00
Robert Maynard bbf732525a CUDA: Add CUDA 13.0 support to 'all' and 'all-major' architecture tables 2025-08-04 11:22:12 -04:00
Robert Maynard 8beb309b79 CUDA: Make sure CUDA architectures are in order 
Make sure we always group major versions together instead
of interleaving 100 and 120 families.
 2025-08-04 11:06:45 -04:00
Brad King a078076983 Merge topic 'link-flags' into release-4.1 
e349b471d8 MSVC: Fix regression that links shared libraries with bogus -shared flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Grossfeld <michael.grossfeld@amd.com>
Merge-request: !10998
 2025-08-02 06:26:18 -04:00
Ben Boeckel ea3280f15b Merge branch 'qcc-8-cxx-lang-flag-3.31' into qcc-8-cxx-lang-flag 
* qcc-8-cxx-lang-flag-3.31:
  QCC-CXX: use `-x c++` on 8+
 2025-08-01 20:51:40 -04:00
Ben Boeckel 166061629a QCC-CXX: use -x c++ on 8+ 
The `-lang-c++` flag has been deprecated.
 2025-08-01 20:51:22 -04:00
Ben Boeckel dc7adb64f3 QCC-CXX: use -x c++ on 8+ 
The `-lang-c++` flag has been deprecated.
 2025-08-01 20:51:03 -04:00
Brad King e349b471d8 MSVC: Fix regression that links shared libraries with bogus -shared flag 
Clear `CMAKE_SHARED_LIBRARY_CREATE_<LANG>_FLAGS` since no special
link flags are needed to create a DLL with MSVC toolchains.
Our shared library creation rules never referenced that placeholder,
so this variable was never used until commit 951e4d3f62 (Ninja,Makefile:
Move builtin linker flags to <LINK_FLAGS> placeholder, 2025-06-09,
v4.1.0-rc1~37^2~2) taught the generators to look it up directly.

This was not previously noticed because the `-shared` flag
is ignored unless the `-WX` flag enables an error on it.

Fixes: #27106
 2025-08-01 12:37:55 -04:00
Brad King f4effce6a4 CMake 4.1.0-rc4 v4.1.0-rc4 2025-07-29 10:17:43 -04:00
Brad King d9afc6c256 Merge topic 'revert-install-DIRECTORY-exclude-empty' into release-4.1 
21e99dbf49 install(DIRECTORY): Revert "Add EXCLUDE_EMPTY_DIRECTORIES option"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10977
 2025-07-29 09:40:53 -04:00
Brad King 21e99dbf49 install(DIRECTORY): Revert "Add EXCLUDE_EMPTY_DIRECTORIES option" 
Revert commit b70ef48b27 (install(DIRECTORY): Add
EXCLUDE_EMPTY_DIRECTORIES option, 2025-04-20, v4.1.0-rc1~212^2).
The implementation had at least two problems:

* It did not exclude the top-level directory if empty.
* It did not exclude non-empty directories whose contents are
  all filtered out.

Revert the feature pending a revised implementation.

Issue: #19189
Closes: #27092
 2025-07-28 14:21:09 -04:00
Brad King 6d9c3809b7 Merge branch 'release-4.0' into release-4.1 2025-07-28 10:22:48 -04:00
Brad King 1de7545e43 Merge topic 'backport-determine-abi-fix' into release-4.1 
41fbc2ce16 CMakeDetermineCompilerABI: Make ABI info string more robust

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10973
 2025-07-28 10:22:08 -04:00
Brad King f374b031c2 Merge branch 'release-3.31' into release-4.0 2025-07-28 10:18:26 -04:00
Brad King a914434d52 Merge topic 'backport-determine-abi-fix' into release-4.0 
41fbc2ce16 CMakeDetermineCompilerABI: Make ABI info string more robust

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10973
 2025-07-28 10:17:59 -04:00
Brad King 752ef0e637 Merge topic 'backport-determine-abi-fix' into release-3.31 
41fbc2ce16 CMakeDetermineCompilerABI: Make ABI info string more robust

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10973
 2025-07-28 10:17:35 -04:00
Brad King 41fbc2ce16 CMakeDetermineCompilerABI: Make ABI info string more robust 
Backport commit c0224f5aa1 (CMakeDetermineCompilerABI: Make ABI info
string more robust, 2025-03-13, v4.1.0-rc1~499^2~4) to 3.31 and 4.0.
 2025-07-28 10:16:02 -04:00
Brad King ab781de957 Merge topic 'lfortran-module-mangling' into release-4.1 
7591439bb8 FortranCInterface: Add support for LFortran module mangling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10969
 2025-07-28 09:30:47 -04:00
Brad King 2308e6f8c9 Merge branch 'release-4.0' into release-4.1 2025-07-28 09:27:22 -04:00