Commit Graph

69522 Commits

Author SHA1 Message Date
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 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 f159011aa9 Merge branch 'release-3.31' into release-4.0 2025-07-28 09:27:12 -04:00
Brad King 2f2ccd53c6 Merge topic 'curl-8.15-deprecated-sectransp' into release-4.0
00c34a7d25 cmCurl: Suppress curl 8.15 deprecation warning for curl 8.[3-5] workaround

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10971
2025-07-28 09:24:57 -04:00
Brad King bed168d9bf Merge topic 'curl-8.15-deprecated-sectransp' into release-3.31
00c34a7d25 cmCurl: Suppress curl 8.15 deprecation warning for curl 8.[3-5] workaround

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10971
2025-07-28 09:23:41 -04:00
Brad King 00c34a7d25 cmCurl: Suppress curl 8.15 deprecation warning for curl 8.[3-5] workaround
Curl 8.15 removed support for Secure Transport and deprecated the
corresponding `CURLSSLBACKEND_SECURETRANSPORT` constant.  We still need
the constant in a workaround for a runtime-checked range of older curl
versions.  Suppress the deprecation warning at compile time.

Fixes: #27086
2025-07-24 11:33:01 -04:00
Brad King 84cdf061e5 Merge topic 'ctest-fix-relative-paths' into release-4.0
f98732bea8 ctest_configure: Restore handling of relative CTEST_BINARY_DIRECTORY
5a1d5fd9be ctest_start: Restore log file location for relative CTEST_BINARY_DIRECTORY

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10912
2025-07-01 10:57:56 -04:00
Daniel Pfeifer f98732bea8 ctest_configure: Restore handling of relative CTEST_BINARY_DIRECTORY
In commit e52eada2c2 (cmCTestConfigureCommand: Refactor command line
construction, 2025-01-28, v4.0.0-rc1~60^2~2) we switched from the
`BuildDirectory` setting, which was always an absolute path, to
`CTEST_BINARY_DIRECTORY`.  Convert it to an absolute path too.

Fixes: #27026
2025-06-30 11:06:14 -04:00
Daniel Pfeifer 5a1d5fd9be ctest_start: Restore log file location for relative CTEST_BINARY_DIRECTORY
Extend commit 3c321b6571 (cmCTestStartCommand: Inline
InitializeFromCommand function, 2024-10-17, v4.0.0-rc1~605^2~6) to
initialize BinaryDir as an absolute path.

Issue: #27026
2025-06-30 11:03:53 -04:00
Brad King 1a27551a46 Merge topic 'vs-outdated-usage' into release-4.0
bd31652e1b VS: Drop outdated usage text about appending platform to generator name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10905
2025-06-25 09:17:39 -04:00
Brad King bd31652e1b VS: Drop outdated usage text about appending platform to generator name
This was missed by commit 381c446ff7 (VS: Remove support for appending a
platform to the generator name, 2024-12-13, v4.0.0-rc1~156^2).

Issue: #26481
2025-06-24 14:23:58 -04:00
Brad King 872d808ed4 Merge topic 'normalize-toolchain-file' into release-4.0
c393300e2b cmake: Restore acceptance of -DCMAKE_TOOLCHAIN_FILE=//... on non-Windows
cf0f46ed85 Tests/RunCMake/CommandLine: Simplify --toolchain cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10901
2025-06-24 10:41:01 -04:00
Brad King c393300e2b cmake: Restore acceptance of -DCMAKE_TOOLCHAIN_FILE=//... on non-Windows
POSIX specifies that two leading slashes have implementation-defined
interpretation, so CMake 3.31 and below did not normalize away leading
double slashes.  However, most implementations simply treat a leading
`//` as just `/`, so CMake 4.0 now normalizes them away when they do not
correspond to a network path on Windows.

This change exposed that we were not normalizing `CMAKE_TOOLCHAIN_FILE`
before passing its value to `include()` the first time if it was not
passed with the `FILEPATH` or `PATH` cache entry type.  Fix that.

Fixes: #27010
2025-06-23 10:37:59 -04:00
Brad King cf0f46ed85 Tests/RunCMake/CommandLine: Simplify --toolchain cases 2025-06-23 10:23:11 -04:00
Brad King a0fa70990e Merge topic 'ci-xcode-16.4' into release-4.0
25ffa98d99 ci: update macOS jobs to use Xcode 16.4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10886
2025-06-17 09:02:08 -04:00
Brad King 25ffa98d99 ci: update macOS jobs to use Xcode 16.4 2025-06-13 14:28:29 -04:00
Brad King 79e82f371c CMake 4.0.3 v4.0.3 2025-06-12 10:31:35 -04:00
Brad King 7e0388220f Merge branch 'release-3.31' into release-4.0 2025-06-12 10:22:32 -04:00
Brad King dbe9d4593f CMake 3.31.8 v3.31.8 2025-06-12 09:51:05 -04:00
Brad King aa221870c7 Merge branch 'release-3.31' into release-4.0 2025-06-11 11:56:25 -04:00
Brad King a26c23a7e0 Merge branch 'release-3.30' into release-3.31 2025-06-11 11:56:14 -04:00
Brad King 50aa13cc5a CMake 3.30.9 v3.30.9 2025-06-11 10:46:07 -04:00
Brad King bfd01bf2ef Merge topic 'instrumentation-fix' into release-4.0
e01d12c14f instrumentation: Prevent unnecessary query loading
f26f127183 instrumentation: Reuse single cmsys::SystemInformation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10863
2025-06-10 09:48:15 -04:00
Martin Duffy e01d12c14f instrumentation: Prevent unnecessary query loading
Don't load queries from instrumentation directories when GetIsInTryCompile
or before ClearGeneratedQueries from previous configures has run.
2025-06-09 11:33:24 -04:00
Martin Duffy f26f127183 instrumentation: Reuse single cmsys::SystemInformation 2025-06-09 11:33:18 -04:00
Brad King 608435c1bb Merge branch 'release-3.31' into release-4.0 2025-06-06 08:14:59 -04:00
Brad King dc646156d0 Merge topic 'cuda-nvcc-system-includes' into release-4.0
d2be863b5e CUDA: Add include paths from nvcc SYSTEM_INCLUDES entry

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10857
2025-06-06 08:12:47 -04:00
Brad King 839fe64201 Merge topic 'cuda-nvcc-system-includes' into release-3.31
d2be863b5e CUDA: Add include paths from nvcc SYSTEM_INCLUDES entry

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10857
2025-06-06 08:12:05 -04:00
Robert Maynard d2be863b5e CUDA: Add include paths from nvcc SYSTEM_INCLUDES entry
Upcoming versions of nvcc are adding support for `SYSTEM_INCLUDES`
which contain includes that are implicitly used with `-isystem`
instead of `-I`.

Support of this is needed in CMake as some CUDA Toolkit releases will
start to have a different include directory layout and using only the
output from `INCLUDES` will be insufficient to find all headers.
2025-06-05 10:53:12 -04:00
Brad King 723505661e Merge branch 'release-3.31' into release-4.0 2025-06-03 07:55:05 -04:00
Brad King d5bd7cf09f Merge topic 'clang-cuda-archs' into release-4.0
33fb4e1a50 CUDA/Clang: Add archs supported by Clang 21
a6aaabbdff CUDA/Clang: Reorder the logic for setting supported archs
695af87c6f CUDA/Clang: Fix list of architectures supported by Clang < 20.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10848
2025-06-03 07:54:16 -04:00
Brad King 160b518252 Merge topic 'clang-cuda-archs' into release-3.31
33fb4e1a50 CUDA/Clang: Add archs supported by Clang 21
a6aaabbdff CUDA/Clang: Reorder the logic for setting supported archs
695af87c6f CUDA/Clang: Fix list of architectures supported by Clang < 20.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10848
2025-06-03 07:52:36 -04:00
Andrey Alekseenko 33fb4e1a50 CUDA/Clang: Add archs supported by Clang 21 2025-06-02 18:35:13 +02:00
Andrey Alekseenko a6aaabbdff CUDA/Clang: Reorder the logic for setting supported archs 2025-06-02 18:34:26 +02:00
Andrey Alekseenko 695af87c6f CUDA/Clang: Fix list of architectures supported by Clang < 20.1
Clang before 20.1 does not recognize sm_100 and newer.  Revise:

* commit b2251e0deb (CUDA/Clang: Update architectures supported by
                     CUDA 12.8, 2025-02-04, v4.0.2~4^2~1^2)
* commit a1b4c30f24 (CUDA: Add CUDA 12.9 new architectures and family
                     syntax, 2025-04-21, v4.0.2~3^2^2)
2025-06-02 10:32:27 -04:00
Brad King 6cf75233b1 Merge branch 'release-3.31' into release-4.0 2025-05-21 08:24:51 -04:00
Brad King 81c7ed367c Merge topic 'ci-msvc-14.44' into release-4.0
e37a40442a ci: Update Windows builds to MSVC 14.44 toolset
c955d5c31f ci: Tie Intel 2024.1 jobs on Windows to MSVC 14.43 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10802
2025-05-21 08:24:03 -04:00
Brad King 7ffb1364ea Merge topic 'ci-msvc-14.44' into release-3.31
e37a40442a ci: Update Windows builds to MSVC 14.44 toolset
c955d5c31f ci: Tie Intel 2024.1 jobs on Windows to MSVC 14.43 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10802
2025-05-21 08:21:01 -04:00
Brad King 149b5830b6 Merge branch 'release-3.31' into release-4.0 2025-05-20 10:46:45 -04:00
Brad King 7092720db5 Merge topic 'Python3.14-support' into release-4.0
41a4a32135 FindPython: Avoid implicit link library on Windows
811f00f9ad FindPython: rely on ABIFLAGS on Windows for ABI profile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10800
2025-05-20 10:45:29 -04:00
Brad King 42e46a7013 Merge topic 'Python3.14-support' into release-3.31
41a4a32135 FindPython: Avoid implicit link library on Windows
811f00f9ad FindPython: rely on ABIFLAGS on Windows for ABI profile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10800
2025-05-20 10:28:24 -04:00
Brad King e37a40442a ci: Update Windows builds to MSVC 14.44 toolset 2025-05-20 10:24:48 -04:00
Brad King c955d5c31f ci: Tie Intel 2024.1 jobs on Windows to MSVC 14.43 toolset
Intel 2024.1 tools do not work with the MSVC 14.44 standard library.
2025-05-20 10:23:30 -04:00
Marc Chevrier 41a4a32135 FindPython: Avoid implicit link library on Windows
Starting with version 3.14, on Windows, by specifying macro Py_NO_LINK_LIB,
the python library is no longer implicitly specified at the link step.

Fixes: #26756
2025-05-20 09:16:14 -04:00
Marc Chevrier 811f00f9ad FindPython: rely on ABIFLAGS on Windows for ABI profile
Starting with Python 3.14, the config_var ABIFLAGS is now also available
on Windows.
2025-05-20 09:16:14 -04:00
Brad King 2794ceda81 Merge branch 'release-3.31' into release-4.0 2025-05-14 16:37:54 -04:00
Brad King dadc015020 Merge topic 'ci-no-kwsys-console-buf' into release-3.31
16ceddc77e ci: Disable KWSys ConsoleBuf test that breaks on Windows Terminal 1.22+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10784
2025-05-14 16:36:47 -04:00
Brad King dc59932f7f Merge topic 'ci-no-kwsys-console-buf' into release-4.0
16ceddc77e ci: Disable KWSys ConsoleBuf test that breaks on Windows Terminal 1.22+

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10784
2025-05-14 16:36:08 -04:00
Brad King 16ceddc77e ci: Disable KWSys ConsoleBuf test that breaks on Windows Terminal 1.22+
We've removed use of KWSys ConsoleBuf in post-4.0 commit 3e88020aed
(StdIo: Replace uses of KWSys ConsoleBuf with StdIo::Console,
2025-05-08).  There is no need to run its test anymore.

Windows-Terminal-Issue: https://github.com/microsoft/terminal/issues/18748
2025-05-14 15:36:11 -04:00
Brad King 347b88129a Merge branch 'release-3.31' into release-4.0 2025-05-14 15:32:14 -04:00