Commit Graph

72934 Commits

Author SHA1 Message Date
Quinn Powell
32a5f11e50 FindOpenGL: respect legacy preference for OpenGL and GLX libraries
Fixes: #27299
2025-11-11 14:46:57 -05:00
Brad King
38ba84cf2e Merge branch 'release-4.2' 2025-11-10 10:50:34 -05:00
Brad King
8b32e8c057 CMake 4.2.0-rc3 v4.2.0-rc3 2025-11-10 09:55:31 -05:00
Brad King
6dcfe66085 Merge topic 'cpack-archive-ownership'
5a18728cec CPack/Archive: Add support for setting UID/GID in archive

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11353
2025-11-10 09:15:13 -05:00
Brad King
deb70f536e Merge topic 'cmake-init'
40b093649b cmake: Avoid calling GetCMakeListFile with empty directory
f6b3ba5f55 CMP0198: Maintain CMAKE_PARENT_LIST_FILE only when configuring projects
3593aa59ef cmake: Replace working mode with role
accfa7fa81 cmake: Infer command failure action from role
e290d4f2a3 cmake: Infer command set from role
bfaaec6179 cmake --workflow: Convert implementation to internal role
ea5d04975e cmake --build: Convert implementation to internal role
0b83750e14 cmake: Clarify name of role of internal instances
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !11395
2025-11-10 09:13:42 -05:00
Brad King
8416e33145 Merge branch 'release-4.2' 2025-11-10 09:12:10 -05:00
Brad King
976512e7ec Merge topic 'update-curl'
fc5aed6035 curl: Restore support for custom CApath without a default
92dcb68826 curl: Set build options the way we need for CMake
8429b65f27 Merge branch 'upstream-curl' into update-curl
e28c33c159 curl 2025-11-05 (400fffa9)
87e10c1053 curl: Update script to get curl 8.17.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11394
2025-11-10 09:12:10 -05:00
Brad King
86cf76a8d8 Merge topic 'update-curl' into release-4.2
fc5aed6035 curl: Restore support for custom CApath without a default
92dcb68826 curl: Set build options the way we need for CMake
8429b65f27 Merge branch 'upstream-curl' into update-curl
e28c33c159 curl 2025-11-05 (400fffa9)
87e10c1053 curl: Update script to get curl 8.17.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11394
2025-11-10 09:12:08 -05:00
Brad King
f9fe81f3f8 Merge branch 'release-4.2' 2025-11-10 09:10:31 -05:00
Brad King
2ea7d97658 Merge branch 'release-4.1' 2025-11-10 09:10:24 -05:00
Brad King
b2a0bef1b0 Merge branch 'release-4.0' 2025-11-10 09:10:17 -05:00
Brad King
2b5b3e351f Merge branch 'release-3.31' 2025-11-10 09:10:10 -05:00
Brad King
d0d72cbde6 Merge branch 'release-4.1' into release-4.2 2025-11-10 09:09:47 -05:00
Brad King
c96cce4d78 Merge branch 'release-4.2' 2025-11-10 09:08:41 -05:00
Brad King
06b3095df7 Merge topic 'process-timeout-short'
6ec2c51f0c execute_process: Restore support for short timeouts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !11399
2025-11-10 09:08:41 -05:00
Brad King
5d69468679 Merge topic 'process-timeout-short' into release-4.2
6ec2c51f0c execute_process: Restore support for short timeouts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !11399
2025-11-10 09:08:39 -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
Kitware Robot
c3ba7ecaa5 CMake Nightly Date Stamp 2025-11-10 00:09:46 -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
fc5aed6035 curl: Restore support for custom CApath without a default
Backport upstream curl commit `f55974c139` (vtls: fix CURLOPT_CAPATH
use, 2025-11-08).  It revises commit `eefd03c572` (ssl: support Apple
SecTrust configurations, 2025-09-24, `curl-8_17_0~443`) to accept
`CURLOPT_CAPATH` when there is no default `CURL_CA_PATH`.

CURL-Issue: https://github.com/curl/curl/issues/19401
CURL-PR: https://github.com/curl/curl/pull/19408
2025-11-09 08:50:16 -05:00
Kitware Robot
11b487d841 CMake Nightly Date Stamp 2025-11-09 00:07:11 -05:00
Clinton Stimpson
5a18728cec CPack/Archive: Add support for setting UID/GID in archive
Add `CPACK_ARCHIVE_UID` and `CPACK_ARCHIVE_GID` options.

Add a policy to change the default to 0/0 to enable ownership
by root if unpacking as root.

Fixes: #12901
2025-11-08 09:25:08 -05:00
Kitware Robot
d90e073cdd CMake Nightly Date Stamp 2025-11-08 00:06:41 -05:00
Brad King
40b093649b cmake: Avoid calling GetCMakeListFile with empty directory 2025-11-07 09:35:55 -05:00
Brad King
f6b3ba5f55 CMP0198: Maintain CMAKE_PARENT_LIST_FILE only when configuring projects
Revise commit 41aea12941 (Do not define CMAKE_PARENT_LIST_FILE in
CMakeLists.txt, 2025-07-05, v4.2.0-rc1~505^2).
2025-11-07 09:35:55 -05:00
Brad King
3593aa59ef cmake: Replace working mode with role 2025-11-07 09:35:55 -05:00
Brad King
accfa7fa81 cmake: Infer command failure action from role 2025-11-07 09:35:55 -05:00
Brad King
e290d4f2a3 cmake: Infer command set from role 2025-11-07 09:35:54 -05:00
Brad King
bfaaec6179 cmake --workflow: Convert implementation to internal role
Previously it initialized as `PROJECT` but didn't actually add any
commands.  This was likely copied from the `--build` implementation,
which has since been converted to `INTERNAL` too.
2025-11-07 09:35:54 -05:00
Brad King
ea5d04975e cmake --build: Convert implementation to internal role
Previously it initialized as `PROJECT` to support reconfiguration with
VS generators, but didn't actually add any commands until needed.
Instead initialize as the `INTERNAL` role and update when adding
commands.
2025-11-07 09:35:54 -05:00
Brad King
0b83750e14 cmake: Clarify name of role of internal instances
These instances do not run arbitrary cmake language code.
2025-11-07 09:35:54 -05:00
Brad King
57ea73f289 cmake: Load options scripts in script role
Some code paths load `.cmake` scripts to get `set(...)` options.
2025-11-07 09:35:54 -05:00
Brad King
0aab75bf0e cmake: Clarify name of enum backing CMAKE_ROLE property 2025-11-07 09:35:53 -05:00
Brad King
9e36f22684 cmake: Clarify name of enum identifying set of commands added 2025-11-07 09:35:53 -05:00
Brad King
5078d5be4f cmake: Clarify name of enum identifying try_compile 2025-11-07 09:35:53 -05:00
Brad King
e62cd22172 cmake: Avoid initializing with empty source and build paths 2025-11-07 09:35:53 -05:00
Brad King
4a2d32e7c4 cmake: Remove unnecessary initialization of empty source and build paths
The explicit initialization with empty paths from commit 57bdc1a2f7
(cmState: Compute and store directory components., 2015-05-04,
v3.3.0-rc1~61^2~4) has not been needed since commit 6afd35b98a (cmState:
remove unused code, 2016-06-16, v3.7.0-rc1~90^2).
2025-11-07 09:35:52 -05:00
Brad King
28610de96b cmake --build: Consolidate role upgrade to reconfigure VS projects 2025-11-07 09:35:52 -05:00
Brad King
cc9290f983 cmake --build: Remove unnecessary source and build directory tracking
The save/restore from commit 427b6da9e5 (VS: Teach `cmake --build` to
reconfigure if needed before building, 2016-09-16, v3.8.0-rc1~290^2)
is unnecessary because `cmake::Build` does not rely on the source
and build directory being initialized.
2025-11-07 09:35:52 -05:00
Brad King
c3b4462147 cmCMakeLanguageCommand: Drop always-true condition 2025-11-07 09:35:52 -05:00
Brad King
1a8390f768 Merge branch 'release-4.2' 2025-11-07 09:20:34 -05:00
Brad King
ff5d7eb498 Merge topic 'ci-fedora-43'
a61ef50ea6 ci: Update Fedora 43 base image to get bzr and flang fixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11393
2025-11-07 09:20:33 -05:00
Brad King
7808d9e4ab Merge topic 'ci-fedora-43' into release-4.2
a61ef50ea6 ci: Update Fedora 43 base image to get bzr and flang fixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11393
2025-11-07 09:20:32 -05:00
Brad King
063f578880 Merge branch 'release-4.2' 2025-11-07 09:18:17 -05:00
Brad King
c7ba476337 Merge topic 'gtest-discovery-race-condition'
72ce711899 GoogleTest: Avoid POST_BUILD race condition for gtest_discover_tests()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11392
2025-11-07 09:18:17 -05:00
Brad King
c77f7b1d3f Merge topic 'gtest-discovery-race-condition' into release-4.2
72ce711899 GoogleTest: Avoid POST_BUILD race condition for gtest_discover_tests()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !11392
2025-11-07 09:18:15 -05:00