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
71,365 Commits 2 Branches 414 Tags
v4.1.3
Commit Graph
71365 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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