mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity
71,348 Commits 2 Branches 385 Tags
14f0d086f74eeecb0e15cb02f0ab40ef09887e62
Commit Graph

71348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Brad King
e8bdd11c69 Merge branch 'release-4.0' into release-4.1 2025-11-10 14:00:25 -05:00
Brad King
e7bcf5e3a3 Merge branch 'release-3.31' into release-4.0 2025-11-10 14:00:15 -05:00
Brad King
253b2b8c7b Merge topic 'backport-3.31-cpack-rpm-weak-deps' into release-3.31 
f357fc27e5 CPack: Backport "correctly perform querytags on old versions of RPM"
1803eda9f7 CPack/RPM: Backport "Fix detection of RPM support for weak dependencies"
d2404872b2 CPack/RPM: Backport "Remove redundant conditions for presence of rpmbuild"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11400
 2025-11-10 13:53:43 -05:00
Brad King
f357fc27e5 CPack: Backport "correctly perform querytags on old versions of RPM" 
Backport commit 488de6294a (CPack: correctly perform querytags on old
versions of RPM, 2025-01-09, v4.0.0-rc1~182^2~3) to CMake 3.31.
 2025-11-10 11:42:44 -05:00
Brad King
1803eda9f7 CPack/RPM: Backport "Fix detection of RPM support for weak dependencies" 
Backport commit 283a48403f (CPack/RPM: Fix detection of RPM support for
weak dependencies, 2025-02-28, v4.0.0-rc3~8^2) to CMake 3.31.

Fixes: #27373
 2025-11-10 11:40:49 -05:00
Brad King
d2404872b2 CPack/RPM: Backport "Remove redundant conditions for presence of rpmbuild" 
Backport commit ab4e74ad0b (CPack/RPM: Remove redundant conditions for
presence of rpmbuild, 2025-02-28, v4.0.0-rc3~8^2~1) to CMake 3.31.
 2025-11-10 11:40:20 -05:00
Brad King
deb88d9fe1 Merge branch 'release-4.0' into release-4.1 2025-11-10 09:07:58 -05:00
Brad King
d11dceee4f Merge topic 'process-timeout-short' into release-4.1 
6ec2c51f0c execute_process: Restore support for short timeouts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11399
 2025-11-10 09:07:39 -05:00
Brad King
f1f39347c2 Merge branch 'release-3.31' into release-4.0 2025-11-10 09:07:22 -05:00
Brad King
1ec4e64227 Merge topic 'process-timeout-short' into release-4.0 
6ec2c51f0c execute_process: Restore support for short timeouts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11399
 2025-11-10 09:06:55 -05:00
Brad King
dd8c14e9e5 Merge topic 'process-timeout-short' into release-3.31 
6ec2c51f0c execute_process: Restore support for short timeouts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11399
 2025-11-10 09:00:43 -05:00
Brad King
6ec2c51f0c execute_process: Restore support for short timeouts 
Since commit 5420639a8d (cmExecuteProcessCommand: Replace cmsysProcess
with cmUVProcessChain, 2023-06-01, v3.28.0-rc1~138^2~8) we've
occasionally observed immediate timeouts on processes that take longer
than the timeout to start, even though we only start the timer after the
child processes start.  The problem is that:

* `uv_loop_init` initializes `uv_loop_t`'s cached "now" time.
* Starting processes takes time but does not update the "now" time.
* `uv_timer_start` computes expiry relative the cached "now" time,
  so short timers may be expired as soon as they are started.
* `uv_run` invokes expired timer callbacks before polling for I/O
  or process completion, so we "timeout" immediately.

Fix this by updating the cached "now" time via `uv_update_time` just
before starting timers.  This is needed only for timers that start
before the `uv_run` event loop.  Update our `uv_timer_ptr` wrapper
to make all callers consider the choice when calling `start()`.
 2025-11-09 09:13:43 -05:00
Brad King
61841b7ee4 Merge topic 'doc-cmake.org-tutorial-archive' into release-4.1 
5473a45fd8 Tutorial: Restore source archive when published on cmake.org

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11370
 2025-10-29 09:29:14 -04:00
Brad King
5473a45fd8 Tutorial: Restore source archive when published on cmake.org 
Restore commit 4cb616fed6 (Tutorial: Provide a source archive when
published on cmake.org, 2022-04-27, v3.23.2~22^2).  Its effects were
accidentally reverted by commit 9784834b4c (Help: Use `*.rst` extension
for included files, 2025-04-07, v4.1.0-rc1~354^2).

Reported-by: Vito Gamberini <vito.gamberini@kitware.com>
 2025-10-29 09:17:14 -04:00
Brad King
66095fd31d Merge topic 'improve-cps-project-error' into release-4.1 
f2b7184b98 cmPackageInfoArguments: Improve error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11363
 2025-10-28 09:17:37 -04:00
Brad King
48908f04f6 Merge topic 'improve-cps-export-namespace-error' into release-4.1 
86e647ef2a CPS: Improve invalid namespace error

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11364
 2025-10-28 09:16:36 -04:00
Matthew Woehlke
86e647ef2a CPS: Improve invalid namespace error 
When CPS export fails due to a dependency on an improperly named
external target, reiterate the "canonical namespace" in the error
message for clarity.
 2025-10-27 14:40:34 -04:00
Matthew Woehlke
f2b7184b98 cmPackageInfoArguments: Improve error message 
When given the name of a project that doesn't exist, report it as an
"unknown project" rather than an "invalid project". This is more
consistent with other, similar reporting.
 2025-10-27 12:29:40 -04:00
Brad King
748921b693 Merge branch 'release-4.0' into release-4.1 2025-10-27 09:25:34 -04:00
Brad King
1b97439d3e Merge branch 'release-3.31' into release-4.0 2025-10-27 09:25:09 -04:00
Brad King
4e2aeae7ba Merge topic 'xcode-macos-deployment-target' into release-4.1 
de53a46a91 Help: Add 4.1 release note for restored Xcode default deployment target
85ba6f5d1b Merge branch 'backport-4.0-xcode-macos-deployment-target'
884260ced6 Help: Add 4.0 release note for restored Xcode default deployment target
1a37c83c7e Xcode: Restore default CMAKE_OSX_DEPLOYMENT_TARGET to run on host
e927408047 Apple: Initialize deployment target after SDK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11361
 2025-10-27 09:12:00 -04:00
Brad King
847ce737c2 Merge topic 'doc-3.31.9-typo' into release-4.1 
d07cedf9b3 Help: Fix typo in 3.31.9 release note heading

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11362
 2025-10-27 09:11:22 -04:00
Brad King
5c67530c0f Merge topic 'ci-macos-sdk' into release-4.1 
baa8cab401 ci: Revert packaging to macOS 15.5 SDK to restore cmake-gui rendering
aa1a122514 ci: Add script to install macOS SDK version 15.5
b33a5366f4 ci: Add script to repackage macOS SDKs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11359
 2025-10-27 09:11:01 -04:00
Brad King
0e2331fc51 Merge topic 'backport-4.0-xcode-macos-deployment-target' into release-4.0 
884260ced6 Help: Add 4.0 release note for restored Xcode default deployment target
1a37c83c7e Xcode: Restore default CMAKE_OSX_DEPLOYMENT_TARGET to run on host
e927408047 Apple: Initialize deployment target after SDK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11361
 2025-10-27 09:09:22 -04:00
Brad King
9f6c47a2a2 Merge topic 'doc-3.31.9-typo' into release-4.0 
d07cedf9b3 Help: Fix typo in 3.31.9 release note heading

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11362
 2025-10-27 09:08:08 -04:00
Brad King
e195639d33 Merge topic 'ci-macos-sdk' into release-4.0 
baa8cab401 ci: Revert packaging to macOS 15.5 SDK to restore cmake-gui rendering
aa1a122514 ci: Add script to install macOS SDK version 15.5
b33a5366f4 ci: Add script to repackage macOS SDKs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11359
 2025-10-27 09:07:58 -04:00
Brad King
b4cdd8aab5 Merge topic 'doc-3.31.9-typo' into release-3.31 
d07cedf9b3 Help: Fix typo in 3.31.9 release note heading

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11362
 2025-10-27 09:06:53 -04:00
Brad King
0fba1500c3 Merge topic 'ci-macos-sdk' into release-3.31 
baa8cab401 ci: Revert packaging to macOS 15.5 SDK to restore cmake-gui rendering
aa1a122514 ci: Add script to install macOS SDK version 15.5
b33a5366f4 ci: Add script to repackage macOS SDKs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11359
 2025-10-27 09:06:25 -04:00
Brad King
d07cedf9b3 Help: Fix typo in 3.31.9 release note heading 2025-10-26 14:06:25 -04:00
Brad King
de53a46a91 Help: Add 4.1 release note for restored Xcode default deployment target 2025-10-26 11:20:10 -04:00
Brad King
85ba6f5d1b Merge branch 'backport-4.0-xcode-macos-deployment-target' 2025-10-26 11:19:58 -04:00
Brad King
884260ced6 Help: Add 4.0 release note for restored Xcode default deployment target 2025-10-26 11:19:19 -04:00
Brad King
1a37c83c7e Xcode: Restore default CMAKE_OSX_DEPLOYMENT_TARGET to run on host 
Xcode by default targets the SDK's macOS version rather than the host's
macOS version.  In commit 7b19531291 (macOS: Do not pass any
SDK/-isysroot to compilers by default, 2024-11-06, v4.0.0-rc1~511^2) we
reverted commit 24aafbde11 (Xcode: Adjust deployment target SDK version
to host version, 2015-10-11, v3.4.0-rc2~6^2), but it is still needed for
Xcode.  Restore the behavior so binaries run on the host by default.

Fixes: #27309
 2025-10-26 11:19:19 -04:00
Brad King
e927408047 Apple: Initialize deployment target after SDK 2025-10-26 11:16:45 -04:00