mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 21:59:54 -06:00
Code Issues Packages Projects Releases Wiki Activity
72,779 Commits 2 Branches 385 Tags
5ec87b2ba7cb6643572cc02db83aaa4d3eaaa700
Commit Graph

72779 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
5ec87b2ba7 Emscripten: Provide CMAKE_<LANG>_COMPILER_ARCHITECTURE_ID 
Extend commit 96d9b94a98 (Emscripten: Add platform modules, 2025-05-16,
v4.2.0-rc1~607^2~3) to account for commit 7f0f382c55 (Provide
CMAKE_<LANG>_COMPILER_ARCHITECTURE_ID on more compilers, 2025-03-24,
v4.1.0-rc1~499^2).

Fixes: #27425
 2025-11-25 15:46:16 -05:00
Brad King
27cc5d58bf Tests/RunCMake/Emscripten: Add tests covering try_compile COPY_FILE 
Compiler inspection relies on `try_compile`'s `COPY_FILE` option to copy
the `.wasm` file because the `.js` does not have the `INFO:size` string.

Issue: #27421
 2025-11-25 15:45:24 -05:00
Brad King
7287032be2 Merge branch 'release-4.1' into release-4.2 2025-11-25 11:13:58 -05:00
Brad King
7dadc53cc3 Merge topic 'flang-j-as-moddir' into release-4.2 
db6b82ae54 LLVMFlang-Fortran: Use -J instead of -module-dir

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: scivision <michael@scivision.dev>
Merge-request: !11443
 2025-11-25 11:13:05 -05:00
Brad King
0848aac41c Merge branch 'release-4.0' into release-4.1 2025-11-25 11:12:29 -05:00
Brad King
d330f70a53 Merge topic 'flang-j-as-moddir' into release-4.1 
db6b82ae54 LLVMFlang-Fortran: Use -J instead of -module-dir

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11443
 2025-11-25 11:12:17 -05:00
Brad King
22e1d0e929 Merge branch 'release-3.31' into release-4.0 2025-11-25 11:12:05 -05:00
Brad King
8d8239c752 Merge topic 'flang-j-as-moddir' into release-4.0 
db6b82ae54 LLVMFlang-Fortran: Use -J instead of -module-dir

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11443
 2025-11-25 11:11:48 -05:00
Brad King
377d390546 Merge topic 'flang-j-as-moddir' into release-3.31 
db6b82ae54 LLVMFlang-Fortran: Use -J instead of -module-dir

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11443
 2025-11-25 11:10:22 -05:00
Brad King
ba961335d9 Merge branch 'release-4.1' into release-4.2 2025-11-25 11:01:44 -05:00
Brad King
32776b4cc6 Merge topic 'cxx-atomic' into release-4.2 
37171d9db0 Source: Improve detection of Linux architectures requiring explicit libatomic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11441
 2025-11-25 11:00:50 -05:00
Brad King
812acd7ee6 Merge topic 'cxx-atomic' into release-4.1 
37171d9db0 Source: Improve detection of Linux architectures requiring explicit libatomic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11441
 2025-11-25 10:59:45 -05:00
Brad King
5a3f22145f Merge topic 'emscripten-platform' into release-4.2 
75e98477e3 Emscripten: Restore placement of source files on compile command-lines

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11444
 2025-11-25 10:29:13 -05:00
Brad King
75e98477e3 Emscripten: Restore placement of source files on compile command-lines 
Since commit 96d9b94a98 (Emscripten: Add platform modules, 2025-05-16,
v4.2.0-rc1~607^2~3), compilation command-lines for Emscripten place
`-c <SOURCE>` before all the flags.  Restore the original order.

Fixes: #27404
 2025-11-24 14:49:19 -05:00
Tarun Prabhu
db6b82ae54 LLVMFlang-Fortran: Use -J instead of -module-dir 
In flang, both -J and -module-dir support both joined and separate values. For
the -J option, these are of the form `-J<value>` and `-J <value>` respectively.
Once https://github.com/llvm/llvm-project/pull/168748 is committed, -module-dir
will only work with a separate value. Setting CMAKE_Fortran_MODDIR_FLAG to -J
ensures that both joined and separate styles will continue to work after that
change is made. As far as behavior is concerned, both -J and -module-dir are
aliases.
 2025-11-24 14:25:21 -05:00
Brad King
37171d9db0 Source: Improve detection of Linux architectures requiring explicit libatomic 
Extend commit fa3c4b6dbf (Source: Link libatomic when needed on any
Linux architecture, 2023-08-24, v3.27.5~9^2) to decide based on the
architecture targeted by the compiler, known since CMake 4.1.
Use `CMAKE_SYSTEM_PROCESSOR` only as a fallback for older versions.

Fixes: #27406
 2025-11-24 11:29:15 -05:00
Brad King
ae5f525826 Merge topic 'ci-vs2026' into release-4.2 
ffa010e32d ci: Update Windows jobs to VS 2026
87c4af996f ci: Enable c++modules shared libraries test on VS ARM64 jobs
dac30821f1 ci: Fix LLVM/Clang nightly CI job tags on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11437
 2025-11-23 11:42:25 -05:00
Brad King
ffa010e32d ci: Update Windows jobs to VS 2026 
Convert most VS 2022 jobs to VS 2026.  Do not convert the IntelLLVM
and Clang jobs that need a VS 2022 command-line environment.
Do not convert jobs covering the `Visual Studio 17 2022` generator.
Add new ones for `Visual Studio 18 2026` instead.
 2025-11-22 18:58:25 -05:00
Brad King
87c4af996f ci: Enable c++modules shared libraries test on VS ARM64 jobs 
This was missed in commit d90a61d671 (VS: Make C++ module BMIs public by
default for shared libraries, 2023-06-08, v3.27.0-rc4~12^2).
 2025-11-22 18:54:42 -05:00
Brad King
dac30821f1 ci: Fix LLVM/Clang nightly CI job tags on Windows 
Since commit c1f4bd792b (ci: Add LLVM/Clang 13.0 nightly CI jobs on
Windows, 2022-02-02, v3.24.0-rc1~734^2) we left out tags corresponding
to the MSVC toolset environment loaded by the jobs.
 2025-11-22 18:54:41 -05:00
Brad King
976e8ef053 Merge topic 'fix-cps-export-definitions' into release-4.2 
37b15eda3b CPS: Fix exporting definitions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !11436
 2025-11-22 18:52:58 -05:00
Brad King
19fc5545d3 Merge topic 'test-try_compile-error-formatting' into release-4.2 
db1657b6a6 Tests/TryCompile: Improve error message formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11435
 2025-11-22 18:51:46 -05:00
Brad King
354a8cdc8e Merge topic 'ci-sccache-idle' into release-4.2 
1e3ccf9484 ci: Tolerate sccache server stop failures on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !11434
 2025-11-22 18:50:34 -05:00
Brad King
0023ff59e4 Merge topic 'doc-4.2-cpack-appimage' into release-4.2 
588fec2a05 Help: Add 4.2 release note for CPack AppImage generator
20dd0973b6 Help: Fix CPack AppImage Generator heading capitalization

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11433
 2025-11-22 18:47:43 -05:00
Matthew Woehlke
37b15eda3b CPS: Fix exporting definitions 
Export compile definitions to CPS using the correct attribute name.

Fixes: #27403
 2025-11-21 15:32:41 -05:00
Brad King
db1657b6a6 Tests/TryCompile: Improve error message formatting 2025-11-21 14:49:08 -05:00
Brad King
1e3ccf9484 ci: Tolerate sccache server stop failures on Windows 
Do not fail a build job because `SCCACHE_IDLE_TIMEOUT` was reached.
 2025-11-21 12:00:25 -05:00
Brad King
588fec2a05 Help: Add 4.2 release note for CPack AppImage generator 
This was missed in commit 1a6dbcc9ea (CPack: Add AppImage generator,
2025-07-30, v4.2.0-rc1~229^2).

Issue: #27104
 2025-11-21 10:07:15 -05:00
Brad King
20dd0973b6 Help: Fix CPack AppImage Generator heading capitalization 2025-11-21 10:07:13 -05:00
Brad King
2fbdf51cdd Merge topic 'vs2026-arm64' into release-4.2 
376b93f48f Tests/RunCMake/GeneratorToolset: Fix Visual Studio 18 2026 host arch on ARM64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11432
 2025-11-21 08:24:41 -05:00
Brad King
16c7b28dc0 Merge topic 'vs2026-android' into release-4.2 
863dc3a7ac VS/Android: Use ApplicationTypeRevision 3.0 in VS2026

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11431
 2025-11-21 08:23:08 -05:00
Brad King
37209a0f28 Merge topic 'ci-cmake-update' into release-4.2 
f5cc8869fb ci: Update CMake version to 4.2.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !11430
 2025-11-21 08:21:33 -05:00
Brad King
376b93f48f Tests/RunCMake/GeneratorToolset: Fix Visual Studio 18 2026 host arch on ARM64 
This was missed in commit 3392b371e2 (VS: Add Visual Studio 18 2026
generator, 2025-08-20, v4.2.0-rc1~165^2~1).
 2025-11-20 18:56:41 -05:00
Brad King
863dc3a7ac VS/Android: Use ApplicationTypeRevision 3.0 in VS2026 
Extend commit e78abf94e3 (VS/Android: Use ApplicationTypeRevision 3.0 in
VS2022, 2023-04-21, v3.27.0-rc1~165^2~4) to cover VS 2026 too.  This was
missed in commit 3392b371e2 (VS: Add Visual Studio 18 2026 generator,
2025-08-20, v4.2.0-rc1~165^2~1).
 2025-11-20 14:06:11 -05:00
Brad King
f5cc8869fb ci: Update CMake version to 4.2.0 2025-11-20 10:57:05 -05:00
Brad King
a0c7f1d29c CMake 4.2.0 v4.2.0 2025-11-19 08:57:10 -05:00
Brad King
5a5681c256 Merge topic 'autogen-tgt-intdir-strategy-docs' into release-4.2 
7d871d7857 Help/CMAKE_AUTOGEN_INTERMEDIATE_DIR_STRATEGY: document supported generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11429
 2025-11-19 08:48:28 -05:00
Brad King
ebb4980c55 Merge topic 'vs-slnx' into release-4.2 
06178da668 VS: Add include_external_msproject detection of `.wapproj` type
b9ce07b85b VS: Add SLNX project types

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11428
 2025-11-19 08:47:05 -05:00
Ben Boeckel
7d871d7857 Help/CMAKE_AUTOGEN_INTERMEDIATE_DIR_STRATEGY: document supported generators 
Fixes: #27388
 2025-11-18 16:28:11 -05:00
Brad King
06178da668 VS: Add include_external_msproject detection of .wapproj type 
It is a Windows Application Packaging Project.

Issue: #27392
 2025-11-18 11:18:17 -05:00
Brad King
b9ce07b85b VS: Add SLNX project types 
Extend commit e6aa7742b0 (VS: Generate .slnx files for VS 2026,
2025-09-17, v4.2.0-rc1~151^2) to add the `Type=` attribute on SLNX
`<Project>` elements.

Fixes: #27392
 2025-11-18 11:10:22 -05:00
Brad King
be291692bf Merge branch 'release-4.1' into release-4.2 2025-11-18 10:37:32 -05:00
Brad King
5961f5f3bc CMake 4.1.3 v4.1.3 2025-11-18 09:55:48 -05:00
Brad King
acfc50620b Merge branch 'release-4.1' into release-4.2 2025-11-18 09:44:46 -05:00
Brad King
89b555f1b5 Merge branch 'release-4.0' into release-4.1 2025-11-18 09:43:32 -05:00
Brad King
5517be2bf1 CMake 4.0.5 v4.0.5 2025-11-18 09:16:12 -05:00
Brad King
319bd95041 Merge branch 'release-4.1' into release-4.2 2025-11-18 09:06:03 -05:00
Brad King
972abd527e Merge topic 'doc-string-xref' into release-4.2 
510d81c7bc Help: Avoid reST named references in string(JSON) synopsis
6c0f37546f Help: Improve string(JSON) synopsis document source readability

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11426
 2025-11-18 09:05:16 -05:00
Brad King
b6f13dabc4 Merge branch 'release-4.0' into release-4.1 2025-11-18 09:04:03 -05:00
Brad King
407a80260b Merge topic 'doc-string-xref' into release-4.1 
510d81c7bc Help: Avoid reST named references in string(JSON) synopsis
6c0f37546f Help: Improve string(JSON) synopsis document source readability

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11426
 2025-11-18 09:03:41 -05:00