mirrors/cmake
2
0
Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-09-25 04:09:36 +03:00
Code Activity
72,941 Commits 2 Branches 414 Tags
v4.2.2
Commit Graph
72941 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 3356d93e66 CMake 4.2.2 v4.2.2 2026-01-20 09:46:37 -05:00
Brad King 2660f5fbb4 Merge topic 'vs-slnx' into release-4.2 
0c97912756 VS: Fix SLNX generation so .NET Core projects build in the IDE
7ce9185792 VS: Add include_external_msproject GUIDs for more project types
ab2ef244bd VS: Add include_external_msproject detection of `.njsproj` type
00db01ddcd Tests: Fix RunCMake.include_external_msproject .sln check failure

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Christian Lichtenberger <christian.lichtenberger@etm.at>
Merge-request: !11613
 2026-01-20 09:35:15 -05:00
Brad King 0c97912756 VS: Fix SLNX generation so .NET Core projects build in the IDE 
Extend commit 46b0202ce0 (VS: Fix SLNX generation so CSharp projects
build in the IDE, 2025-10-23, v4.2.0-rc2~26^2) to cover .NET Core
projects.

Fixes: #27524
 2026-01-19 15:53:20 -05:00
Brad King 7ce9185792 VS: Add include_external_msproject GUIDs for more project types 
Issue: #27524
 2026-01-19 15:50:55 -05:00
Brad King ab2ef244bd VS: Add include_external_msproject detection of .njsproj type 
It is a NodeJS Project.
 2026-01-19 15:50:05 -05:00
Brad King 00db01ddcd Tests: Fix RunCMake.include_external_msproject .sln check failure 
Accumulate failures instead of only considering the last case.
 2026-01-19 15:49:19 -05:00
Brad King d6a62d17ca Merge branch 'release-4.1' into release-4.2 2026-01-19 11:38:52 -05:00
Brad King 7943956e47 Merge topic 'ci-nvhpc' into release-4.2 
f7669bbeed ci: Clamp CUDA 'native' architecture in NVHPC job

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11610
 2026-01-19 11:38:18 -05:00
Brad King 24c3df71d0 Merge branch 'release-4.0' into release-4.1 2026-01-19 11:35:44 -05:00
Brad King 9eb65a68bc Merge topic 'ci-nvhpc' into release-4.1 
f7669bbeed ci: Clamp CUDA 'native' architecture in NVHPC job

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11610
 2026-01-19 11:35:34 -05:00
Brad King 01eedf3d94 Merge branch 'release-3.31' into release-4.0 2026-01-19 11:35:29 -05:00
Brad King b9009be4a1 Merge topic 'ci-nvhpc' into release-4.0 
f7669bbeed ci: Clamp CUDA 'native' architecture in NVHPC job

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11610
 2026-01-19 11:35:12 -05:00
Brad King a2c9682e66 Merge topic 'ci-nvhpc' into release-3.31 
f7669bbeed ci: Clamp CUDA 'native' architecture in NVHPC job

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11610
 2026-01-19 11:34:14 -05:00
Brad King f7669bbeed ci: Clamp CUDA 'native' architecture in NVHPC job 
Extend commit ff8c0e9c10 (ci: Clamp CUDA 'native' architecture to values
supported by its toolkit, 2022-03-14, v3.24.0-rc1~468^2) to cover the
NVHPC job too.
 2026-01-19 10:54:35 -05:00
Brad King 57137c5f8b Merge branch 'release-4.1' into release-4.2 2026-01-16 09:35:39 -05:00
Brad King cdbd7bf2f2 Merge topic 'fileapi-instrumentation-initial-cache' into release-4.2 
ed023e0cfc Merge branch 'backport-4.0-fileapi-instrumentation-initial-cache'
5b63ea9ad3 instrumentation: Fix crash on cmake_instrumentation() call in initial cache
1bd6e70430 Merge branch 'backport-4.0-fileapi-instrumentation-initial-cache'
bb23f65928 instrumentation: Fix crash on cmake_instrumentation() call in initial cache
8523e579dc Merge branch 'backport-3.31-fileapi-initial-cache'
4d712cfc25 fileapi: Fix crash on cmake_file_api() call in initial cache

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11598
 2026-01-16 09:34:42 -05:00
Brad King 88db21851b Merge branch 'release-4.0' into release-4.1 2026-01-16 09:31:49 -05:00
Brad King bad6ed00e5 Merge topic 'backport-4.0-fileapi-instrumentation-initial-cache' into release-4.1 
bb23f65928 instrumentation: Fix crash on cmake_instrumentation() call in initial cache
8523e579dc Merge branch 'backport-3.31-fileapi-initial-cache'
4d712cfc25 fileapi: Fix crash on cmake_file_api() call in initial cache

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11598
 2026-01-16 09:31:27 -05:00
Brad King 59bbe83b9a Merge branch 'release-3.31' into release-4.0 2026-01-16 09:31:03 -05:00
Brad King 0ce101913c Merge topic 'backport-4.0-fileapi-instrumentation-initial-cache' into release-4.0 
bb23f65928 instrumentation: Fix crash on cmake_instrumentation() call in initial cache
8523e579dc Merge branch 'backport-3.31-fileapi-initial-cache'
4d712cfc25 fileapi: Fix crash on cmake_file_api() call in initial cache

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11598
 2026-01-16 09:29:19 -05:00
Brad King 351ad4cfbd Merge topic 'backport-3.31-fileapi-initial-cache' into release-3.31 
4d712cfc25 fileapi: Fix crash on cmake_file_api() call in initial cache

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11598
 2026-01-16 09:26:18 -05:00
Brad King 88384f6b1a Merge topic 'vs2026-runtimedeps' into release-4.2 
f51dd918b2 file(GET_RUNTIME_DEPENDENCIES): Support VS 2026 without VS 2022

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11596
 2026-01-16 09:25:50 -05:00
Brad King ed023e0cfc Merge branch 'backport-4.0-fileapi-instrumentation-initial-cache' 2026-01-15 15:14:51 -05:00
Martin Duffy 5b63ea9ad3 instrumentation: Fix crash on cmake_instrumentation() call in initial cache 2026-01-15 15:14:19 -05:00
Brad King 1bd6e70430 Merge branch 'backport-4.0-fileapi-instrumentation-initial-cache' 2026-01-15 15:14:01 -05:00
Martin Duffy bb23f65928 instrumentation: Fix crash on cmake_instrumentation() call in initial cache 2026-01-15 15:13:34 -05:00
Brad King 8523e579dc Merge branch 'backport-3.31-fileapi-initial-cache' 2026-01-15 15:13:13 -05:00
Martin Duffy 4d712cfc25 fileapi: Fix crash on cmake_file_api() call in initial cache 2026-01-15 14:51:57 -05:00
Clinton Stimpson f51dd918b2 file(GET_RUNTIME_DEPENDENCIES): Support VS 2026 without VS 2022 
Find MSVC tools in VS 2026 installation.

This was missed in commit 3392b371 (VS: Add Visual Studio 18 2026
generator, 2025-08-20, v4.2.0-rc1~165^2~1).  Follow the pattern from
commit 235b5fb05b (file(GET_RUNTIME_DEPENDENCIES): Support VS 2022
without VS 2019, 2022-05-19, v3.21.7~3^2).

Fixes: #27511
 2026-01-14 10:42:40 -05:00
Brad King 048f2924bf Merge branch 'release-4.1' into release-4.2 2026-01-14 08:50:41 -05:00
Brad King 79a61958b4 Merge topic 'ci-cuda-archs' into release-4.2 
ba5b89afb3 ci: Fix CUDA tests on GPUs newer than the toolkit supports

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11592
 2026-01-14 08:49:53 -05:00
Brad King 5bc44d4a38 Merge branch 'release-4.0' into release-4.1 2026-01-14 08:49:14 -05:00
Brad King cd4c4f261b Merge topic 'ci-cuda-archs' into release-4.1 
ba5b89afb3 ci: Fix CUDA tests on GPUs newer than the toolkit supports

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11592
 2026-01-14 08:48:59 -05:00
Brad King 4f58ef85e4 Merge branch 'release-3.31' into release-4.0 2026-01-14 08:48:50 -05:00
Brad King b5ec12599f Merge topic 'ci-cuda-archs' into release-4.0 
ba5b89afb3 ci: Fix CUDA tests on GPUs newer than the toolkit supports

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11592
 2026-01-14 08:48:30 -05:00
Brad King cab0f6cfa8 Merge topic 'ci-cuda-archs' into release-3.31 
ba5b89afb3 ci: Fix CUDA tests on GPUs newer than the toolkit supports

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11592
 2026-01-14 08:47:52 -05:00
Brad King 0c2e4d8422 Merge topic 'fix-cmp0199' into release-4.2 
35d5a4fd6d GenEx: Partially restore pre-CMP0199 behavior of $<CONFIG>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Matthew Woehlke <matthew.woehlke@kitware.com>
Merge-request: !11581
 2026-01-13 11:05:09 -05:00
Brad King acf4ea25e7 Merge topic 'fileapi-windows-implib-missing-error' into release-4.2 
c6a940761c fileapi: Handle unused imported libraries with missing IMPORTED_IMPLIB

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !11585
 2026-01-13 10:32:18 -05:00
Brad King 554f264cb2 Merge topic 'Windows-compilation-c++11' into release-4.2 
a4a5690cd3 CMake: Restore support for compiling as C++11 on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11586
 2026-01-13 10:26:35 -05:00
Brad King ba5b89afb3 ci: Fix CUDA tests on GPUs newer than the toolkit supports 
Extend commit ff8c0e9c10 (ci: Clamp CUDA 'native' architecture to values
supported by its toolkit, 2022-03-14, v3.24.0-rc1~468^2) to avoid
failures due to `nvcc -arch=native`.
 2026-01-13 09:43:25 -05:00
Matthew Woehlke 35d5a4fd6d GenEx: Partially restore pre-CMP0199 behavior of $<CONFIG> 
Modify the implementation of policy CMP0199 to only remove the oddball
configuration map matching of `$<CONFIG>` in `NEW` mode, restoring the
old behavior of matching BOTH the consumer's configuration and the
selected configuration of the imported target. It turns out that users
are more dependent on the former than the latter, and while matching
more than one thing is still dodgy, we will likely need to introduce a
new generator expression to match the selected configuration of the
imported target.

Meanwhile, `$<CONFIG>` on targets imported from CPS still only matches
the selected configuration of the imported target, which is the behavior
specified by CPS. However, this can only happen for `$<CONFIG>`
expressions that were generated internally during import.

Update documentation and test cases accordingly.

Fixes: #27487
Fixes: #27495
 2026-01-12 10:58:08 -05:00
Marc Chevrier a4a5690cd3 CMake: Restore support for compiling as C++11 on Windows 
Fixes: #27505
 2026-01-12 10:58:07 -05:00
Brad King eba87f1834 Merge topic 'cpack-appimage-user-apprun' into release-4.2 
078f28f16b CPack/AppImage: Add support for a custom AppRun file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11577
 2026-01-12 09:18:32 -05:00
Brad King 7792c68838 Merge topic 'timeout-after-match-stop-time-behavior' into release-4.2 
68beb2e514 Tests/CTestTimeoutAfterMatch: add case for stop time bug
af7427675a cmProcess: compute the timeout when needed
c6940b0dcc cmProcess: explicitly track the StopTimeout

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !11551
 2026-01-09 09:58:10 -05:00
Brad King 92d65518e6 Merge topic 'vs-charset' into release-4.2 
4419bf1182 VS: Restore unicode character set for custom targrets on WindowsStore

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11578
 2026-01-09 09:48:19 -05:00
Mathieu 078f28f16b CPack/AppImage: Add support for a custom AppRun file 
Allow the users to install a custom AppRun file.
Otherwise create a default one.

Fixes: #27478
 2026-01-09 09:41:03 -05:00
Craig Scott c6a940761c fileapi: Handle unused imported libraries with missing IMPORTED_IMPLIB 
CMake 4.1 and earlier did not issue an error if an imported shared library target
was missing an IMPORTED_IMPLIB property and nothing used that imported
library. There was no code path checking for the CMP0111 NEW behavior. Since
b626843d71 (fileAPI: Output all INTERFACE and IMPORTED targets, 2025-09-13),
we now include all imported targets in the file API replies, and that does trigger
that check. We need to tolerate such imported targets to preserve backward
compatibility, and to avoid issuing errors for problems in targets likely to be
coming from outside the project and beyond the developer's control.

Fixes: #27496
 2026-01-10 00:26:55 +11:00
Brad King 4419bf1182 VS: Restore unicode character set for custom targrets on WindowsStore 
Restore conditions broken by commit 19a61e56cf (VS: Refactor MSVC
character set selection, 2025-10-10, v4.2.0-rc1~12^2~1).  We had misread
the purpose/scope of the `<= cmStateEnums::OBJECT_LIBRARY` condition.
In the original code it was only about safely indexing `ClOptions`,
not about the kinds of targets that can use a unicode character set.

Fixes: #27490
 2026-01-08 11:46:11 -05:00
Brad King 884b86e8c8 Merge branch 'release-4.1' into release-4.2 2026-01-08 08:18:27 -05:00
Brad King d3759c8c68 Merge topic 'ci-xcode-26.2' into release-4.2 
bc18ef4400 ci: update macOS jobs to use Xcode 26.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11576
 2026-01-08 08:14:47 -05:00