mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-25 16:09:42 -06:00
Code Issues Packages Projects Releases Wiki Activity
71,382 Commits 2 Branches 386 Tags
v4.1.4
Commit Graph

71382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
892fad3d23 CMake 4.1.4 v4.1.4 2025-12-08 11:30:41 -05:00
Brad King
c267e6d104 Merge topic 'doc-4.1-vs-flags' into release-4.1 
e2646b9926 Help: Add 4.1 release note about VS flag suppression

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11489
 2025-12-08 11:00:12 -05:00
Brad King
e2646b9926 Help: Add 4.1 release note about VS flag suppression 
Document flags suppressed by commit 7db3dbddb2 (VS: Suppress MSBuild
default flags not specified by project or user, 2025-06-02,
v4.1.0-rc1~69^2).
 2025-12-08 10:28:32 -05:00
Brad King
a9c997edc0 Merge topic 'vs2019-v142' into release-4.1 
8c332a3c7f VS: Restore support for VS 2019 with toolset v142 versions before 14.29

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11480
 2025-12-08 09:57:50 -05:00
Brad King
8c332a3c7f VS: Restore support for VS 2019 with toolset v142 versions before 14.29 
Since commit 7db3dbddb2 (VS: Suppress MSBuild default flags not
specified by project or user, 2025-06-02, v4.1.0-rc1~69^2) we suppress
the `-Zc:inline` default flag when the project/user does not specify it.
That triggers an apparent bug in VS 2019 with v142 toolset versions
before 14.29 in which MSBuild fails when both `-Zc:inline` and `-nologo`
are suppressed.  This happens when `CMAKE_VERBOSE_MAKEFILE` is enabled,
such as in `try_compile` projects like our builtin compiler inspection.

Since `-nologo` is incidental, avoid suppressing it if `-Zc:inline` is
also suppressed.  Limit this workaround to relevant toolset versions.

Fixes: #27439
 2025-12-05 12:47:53 -05:00
Brad King
121234b968 Merge topic 'fix-cps-export-definitions' into release-4.1 
b2ca9fba8b CPS: Fix exporting definitions in CMake 4.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11469
 2025-12-01 13:59:36 -05:00
Brad King
b43eb123e4 Merge topic 'stdio-ctrl-c' into release-4.1 
e419429616 StdIo: Restore Windows Console I/O modes on Ctrl-C

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11457
 2025-12-01 12:27:59 -05:00
Matthew Woehlke
b2ca9fba8b CPS: Fix exporting definitions in CMake 4.1 
Backport commit 37b15eda3b (CPS: Fix exporting definitions, 2025-11-21)
to CMake 4.1.

Export compile definitions to CPS using the correct attribute name.

Fixes: #27403
 2025-12-01 12:15:51 -05:00
Brad King
e419429616 StdIo: Restore Windows Console I/O modes on Ctrl-C 
Extend commit fb3e7825f3 (StdIo: Restore Windows Console I/O modes on
exit, 2025-05-23, v4.1.0-rc1~114^2) to cover termination by Ctrl-C.

Fixes: #27427
 2025-11-26 15:18:03 -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
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
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
5961f5f3bc CMake 4.1.3 v4.1.3 2025-11-18 09:55:48 -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
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
Brad King
96a6b2be06 Merge branch 'release-3.31' into release-4.0 2025-11-18 09:03:27 -05:00
Brad King
e54eda8159 Merge topic 'doc-string-xref' into release-4.0 
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:15 -05:00
Brad King
6672acb8b4 Merge topic 'doc-string-xref' into release-3.31 
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:01:58 -05:00
Brad King
510d81c7bc Help: Avoid reST named references in string(JSON) synopsis 
Also revert commit 9702a01dc9 (Help: string(LENGTH): Fix synopsis link
to command description, 2023-12-30, v3.28.2~23^2).  It was only needed
to avoid re-using a named reference that we've now removed.

Issue: #25546
 2025-11-17 16:31:37 -05:00
Brad King
6c0f37546f Help: Improve string(JSON) synopsis document source readability 
Avoid spaces in signature target names.
 2025-11-17 16:31:37 -05:00
Brad King
1d303f6beb Merge branch 'release-4.0' into release-4.1 2025-11-17 16:26:50 -05:00
Brad King
b4528858f8 Merge branch 'release-3.31' into release-4.0 2025-11-17 16:26:39 -05:00
Brad King
ca626022f5 CMake 3.31.10 v3.31.10 2025-11-17 14:28:31 -05:00
Brad King
50380f1bc1 Merge branch 'release-4.0' into release-4.1 2025-11-14 09:31:27 -05:00
Brad King
14f0d086f7 Merge topic 'ci-xcode-26.1' into release-4.1 
cf10b47e57 ci: update macOS jobs to use Xcode 26.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11416
 2025-11-14 09:31:13 -05:00
Brad King
e5bf8a6324 Merge branch 'release-3.31' into release-4.0 2025-11-14 09:30:53 -05:00
Brad King
16ffc77177 Merge topic 'ci-xcode-26.1' into release-4.0 
cf10b47e57 ci: update macOS jobs to use Xcode 26.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11416
 2025-11-14 09:30:44 -05:00
Brad King
04d8da5f19 Merge topic 'ci-xcode-26.1' into release-3.31 
cf10b47e57 ci: update macOS jobs to use Xcode 26.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11416
 2025-11-14 09:29:17 -05:00
Brad King
cf10b47e57 ci: update macOS jobs to use Xcode 26.1 2025-11-13 13:55:08 -05:00
Brad King
690eb1c070 Merge branch 'release-4.0' into release-4.1 2025-11-12 10:53:23 -05:00
Brad King
39ccffa076 Merge topic 'process-timeout-terminate' into release-4.1 
3dc641d99c Merge branch 'backport-3.31-process-timeout-terminate'
22e84c7e7f execute_process: Restore termination of processes on timeout
e2cfc61e5e execute_process: Restore termination of processes on timeout (3.31)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11408
 2025-11-12 10:53:09 -05:00
Brad King
cfd54d02a5 Merge branch 'release-3.31' into release-4.0 2025-11-12 10:52:49 -05:00
Brad King
b9a06e1bd1 Merge topic 'process-timeout-terminate' into release-4.0 
3dc641d99c Merge branch 'backport-3.31-process-timeout-terminate'
22e84c7e7f execute_process: Restore termination of processes on timeout
e2cfc61e5e execute_process: Restore termination of processes on timeout (3.31)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11408
 2025-11-12 10:52:05 -05:00
Brad King
5d73c4bc62 Merge topic 'backport-3.31-process-timeout-terminate' into release-3.31 
e2cfc61e5e execute_process: Restore termination of processes on timeout

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11408
 2025-11-12 10:48:36 -05:00
Brad King
3dc641d99c Merge branch 'backport-3.31-process-timeout-terminate' 2025-11-11 10:03:15 -05:00
Brad King
22e84c7e7f execute_process: Restore termination of processes on timeout 
Since commit 5420639a8d (cmExecuteProcessCommand: Replace cmsysProcess
with cmUVProcessChain, 2023-06-01, v3.28.0-rc1~138^2~8) we have not
actually terminated child processes on an `execute_process` timeout.
Similarly for other migrations from cmsysProcess to cmUVProcessChain.

Teach cmUVProcessChain clients that implement timeouts to actually
terminate remaining child processes when the timeout is reached.

Fixes: #27378
 2025-11-11 09:10:29 -05:00
Brad King
e2cfc61e5e execute_process: Restore termination of processes on timeout 
Since commit 5420639a8d (cmExecuteProcessCommand: Replace cmsysProcess
with cmUVProcessChain, 2023-06-01, v3.28.0-rc1~138^2~8) we have not
actually terminated child processes on an `execute_process` timeout.
Similarly for other migrations from cmsysProcess to cmUVProcessChain.

Teach cmUVProcessChain clients that implement timeouts to actually
terminate remaining child processes when the timeout is reached.

Fixes: #27378
 2025-11-11 09:06:49 -05:00
Brad King
7c3958c0b0 Merge branch 'release-4.0' into release-4.1 2025-11-11 08:21:08 -05:00
Brad King
106ba5cd47 Merge topic 'test-libarchive-3.8.2' into release-4.1 
576117b7eb Tests: Update expected Zstandard magic number for libarchive 3.8.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11402
 2025-11-11 08:20:45 -05:00
Brad King
63465e8858 Merge branch 'release-3.31' into release-4.0 2025-11-11 08:20:37 -05:00
Brad King
70848d79b9 Merge topic 'test-libarchive-3.8.2' into release-4.0 
576117b7eb Tests: Update expected Zstandard magic number for libarchive 3.8.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11402
 2025-11-11 08:20:20 -05:00
Brad King
7c28c08500 Merge topic 'test-libarchive-3.8.2' into release-3.31 
576117b7eb Tests: Update expected Zstandard magic number for libarchive 3.8.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11402
 2025-11-11 08:19:11 -05:00
Brad King
576117b7eb Tests: Update expected Zstandard magic number for libarchive 3.8.2 
libarchive 3.8.2 enabled Zstandard's checksum feature in the zstd write
filter.  Update our tests' expected results accordingly.

Fixes: #27355
Reported-by: Funda Wang <fundawang@yeah.net>
 2025-11-10 15:11:10 -05:00