Commit Graph

66480 Commits

Author SHA1 Message Date
Brad King
21808be3bf Merge topic 'FindPython-WIN32-EXECUTABLE_DEBUG' into release-3.30
c25df125e1 FindPython: Fix usage of cached variable _Python_EXECUTABLE_DEBUG

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Hillel Sims <hsims1@bloomberg.net>
Merge-request: !9686
2024-07-29 11:01:34 -04:00
Brad King
9adccab675 Merge topic 'doc-add_test-typo' into release-3.30
ca39258a66 Help: Fix typo in add_test documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9687
2024-07-29 10:58:59 -04:00
Craig Scott
51b5d9f464 Merge topic 'fetchcontent-updates-disconnected' into release-3.30
5df592ce31 FetchContent: Ensure can_fetch_default is set early enough
c233c51cb9 ExternalProject: Fix bad indenting for uses_terminal

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Silver Zachara <silver.zachara@gmail.com>
Merge-request: !9685
2024-07-27 18:28:18 -04:00
Brad King
ca39258a66 Help: Fix typo in add_test documentation 2024-07-26 10:37:35 -04:00
Marc Chevrier
c25df125e1 FindPython: Fix usage of cached variable _Python_EXECUTABLE_DEBUG
Fixes: #26163
2024-07-26 14:36:20 +02:00
Craig Scott
5df592ce31 FetchContent: Ensure can_fetch_default is set early enough
The can_fetch_default variable needs to be set before the call to
_ep_write_gitupdate_script(). Move it to before that call and always
set the variable, even if arg_SCRIPT_FILE is not set. This makes the
generated git update script file easier to follow if someone tries to
follow what it is doing or wants to investigate problems and run it
manually.

Fixes: #26164
2024-07-26 11:23:58 +10:00
Craig Scott
c233c51cb9 ExternalProject: Fix bad indenting for uses_terminal 2024-07-26 10:58:19 +10:00
Brad King
aad3ee074b Merge topic 'ep-svn-user-pass' into release-3.30
e16f65be15 ExternalProject: Don't add SVN auth args if not set

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9678
2024-07-23 09:53:27 -04:00
Brad King
b55f5cba1d Merge topic 'bootstrap-no-pkg-config' into release-3.30
35eb28bc76 bootstrap: Restore support for system jsoncpp and uv without pkg-config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Turbov <i.zaufi@gmail.com>
Merge-request: !9679
2024-07-23 09:52:08 -04:00
Brad King
20efbc07df Merge topic 'cpack-external-partial-json' into release-3.30
ab26d334bf cmCPackExternalGenerator: ensure JSON is written before running the script

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9669
2024-07-23 09:51:12 -04:00
ojab ojab
35eb28bc76 bootstrap: Restore support for system jsoncpp and uv without pkg-config
In commit da5de7f9f3 (bootstrap: Allow --boostrap-system-* libraries
custom prefixes, 2024-03-03, v3.30.0-rc1~456^2) the non-pkg-config code
path for uv/jsoncpp/rhash all set `use_librhash_ldflags` instead of
their own variable.
2024-07-22 10:33:50 -04:00
Brad King
089e946399 Merge topic 'macos-check-archs' into release-3.30
74beb6dba8 Xcode: Restore support for CMAKE_OSX_ARCHITECTURES=$(ARCHS_STANDARD)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Lorenz Bucher <lorenz.bucher@gmail.com>
Merge-request: !9675
2024-07-22 10:20:04 -04:00
Craig Scott
e16f65be15 ExternalProject: Don't add SVN auth args if not set
In 462e583267 (ExternalProject: Switch download, update and patch to
use _EP_ vars, 2024-05-13), the svn_username and svn_password variables
were only updated appropriately in the svn download implementation, but
not in the svn update implementation. This was easily missed in part
because the old implementation was relying on behavior that differed
from the documentation for get_property(), and the new implementation
tried to keep the intermediate variables from the old implementation but
missed this subtle aspect.

Issue: #26152
Fixes: #26148
2024-07-20 11:58:33 +10:00
Brad King
39e8f67a2f Merge topic 'ci-cmake-update' into release-3.30
927300d4a0 ci: Update CMake version to 3.30.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9671
2024-07-19 10:05:49 -04:00
Brad King
74beb6dba8 Xcode: Restore support for CMAKE_OSX_ARCHITECTURES=$(ARCHS_STANDARD)
Skip the `CMAKE_OSX_ARCHITECTURES` validation added by commit db409e5e68
(APPLE: Check if compilers respect CMAKE_OSX_ARCHITECTURES, 2024-05-04,
v3.30.0-rc1~15^2) if the value contains a placeholder, since we do not
know the real value.

Fixes: #26128
2024-07-19 09:42:45 -04:00
Brad King
927300d4a0 ci: Update CMake version to 3.30.1 2024-07-18 09:59:36 -04:00
Brad King
cd386f6425 CMake 3.30.1 v3.30.1 2024-07-18 09:13:21 -04:00
Brad King
07c1287c87 Merge topic 'vs-cuda' into release-3.30
a9210a0c02 VS: Restore support for CUDA with no optimization flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !9666
2024-07-18 08:57:47 -04:00
Brad King
d12c3e711d Merge topic 'macos-curl-backend' into release-3.30
f2596dfa0e macOS: Work around bug in system curl 8.{3,4,5} LibreSSL backend

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !9663
2024-07-18 08:56:30 -04:00
Ben Boeckel
ab26d334bf cmCPackExternalGenerator: ensure JSON is written before running the script
First, use `cmGeneratedFileStream` to avoid touching an existing file
unless its contents change and to get atomic replacement. Also add a
scope to ensure that the file is in place (at `fout`'s destructor)
before doing anything with the packaging scripts.

See: https://discourse.cmake.org/t/1773
2024-07-18 07:50:46 -04:00
Brad King
a9210a0c02 VS: Restore support for CUDA with no optimization flags
Since commit 67de5b7b82 (VS: Suppress MSBuild default settings affected
by UseDebugLibraries, 2024-02-13, v3.30.0-rc1~538^2~1) we generate an
empty `Optimization` element for the host compiler when there are no C
or C++ optimization flags enabled.  The CUDA Toolkit Visual Studio
integration fails with an error if an empty string is inherited from the
host compiler's `Optimization` element.  If no CUDA optimization flags
are specified, write an explicit empty `Optimization` element for the
CUDA compiler too.

Fixes: #26144
2024-07-17 11:42:31 -04:00
Brad King
f2596dfa0e macOS: Work around bug in system curl 8.{3,4,5} LibreSSL backend
Since commit d3cbee99e3 (macOS: Prefer building with system-provided
curl, 2024-05-09, v3.30.0-rc1~130^2~1) CMake uses the macOS-provided
curl, which uses the LibreSSL backend by default.  This exposes us to
curl issue 12525, created and fixed by the following upstream curl
commits:

* commit `bec0c5bbf` (openssl: switch to modern init for
                      LibreSSL 2.7.0+, 2023-08-07, `curl-8_3_0~201`)
* commit `9f2d2290d` (openssl: re-match LibreSSL deinit with init,
                      2023-12-15, `curl-8_6_0~219`)

Work around the bug by preferring the secure-transport backend by
default on the problematic versions of curl.
2024-07-17 09:13:26 -04:00
Brad King
3b2ef9b54c Merge branch 'release-3.29' into release-3.30 2024-07-16 13:49:33 -04:00
Brad King
928571f3c2 CMake 3.29.7 v3.29.7 2024-07-16 13:14:29 -04:00
Brad King
5a3eabcd1f Merge topic 'custom-transitive-properties' into release-3.30
7a77a6c642 Restore support for exporting INTERFACE with missing dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !9656
2024-07-16 10:32:14 -04:00
Brad King
0c567293bf Merge topic 'IntelLLVM-layout-2024' into release-3.30
ceb58f0ccf IntelLLVM: Update toolchain layout for 2024+ versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9653
2024-07-16 10:30:50 -04:00
Brad King
365619ed97 Merge topic 'doc-mark-deprecated' into release-3.30
723e236224 Help: Move deprecated modules and variables to dedicated sections

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9651
2024-07-16 10:29:58 -04:00
Brad King
45a46e97b7 Merge topic 'libuv-idna' into release-3.30
890beb19e6 libuv: backport IDNA input/output hardening fixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9658
2024-07-16 10:28:16 -04:00
Brad King
e69b8a4ff1 Merge topic 'FindMatlab-no-langs' into release-3.30
70cbcb1da3 FindMatlab: Restore support for finding Matlab without any languages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9657
2024-07-16 10:27:16 -04:00
Pavel Liavonau
ceb58f0ccf IntelLLVM: Update toolchain layout for 2024+ versions
HPC Intel changed layout of llvm related binary files from
`bin/../bin-llvm` to `bin/compiler`.
2024-07-15 17:07:55 -04:00
權少
723e236224 Help: Move deprecated modules and variables to dedicated sections
These were missed in commit e0355c4ea9 (FindBoost: Add policy to remove
this module, 2024-05-03, v3.30.0-rc1~150^2) and commit 0aba13a2f3
(ctest: Add explicit options for TLS server verification, 2024-03-01,
v3.30.0-rc1~408^2~3).
2024-07-15 16:55:38 -04:00
Brad King
890beb19e6 libuv: backport IDNA input/output hardening fixes
Backport libuv commit `0f2d7e78` (fix: always zero-terminate idna
output, 2024-01-18, `v1.48.0~4`) and libuv commit `3530bcc3` (fix:
reject zero-length idna inputs, 2024-01-18, `v1.48.0~3`).

Fixes: #26112
2024-07-15 15:55:23 -04:00
Brad King
70cbcb1da3 FindMatlab: Restore support for finding Matlab without any languages
Revise commit 657064b6d4 (FindMatlab: Refactor: Eliminate
_matlab_64Build, 2024-01-24, v3.30.0-rc1~594^2~5) to more faithfully
reproduce the original behavior.

Revise commit 91c672e5ae (FindMatlab: Use find_package(Threads) instead
of checking -pthread, 2024-02-02, v3.30.0-rc1~594^2~1) to restore the
old behavior of looking for threads only with C or CXX enabled.

Fixes: #26121
2024-07-15 15:01:15 -04:00
Brad King
7a77a6c642 Restore support for exporting INTERFACE with missing dependencies
Since commit c16acd35b3 (GenEx: Add support for custom transitive link
properties, 2024-05-09, v3.30.0-rc1~82^2) evaluation of
`TRANSITIVE_LINK_PROPERTIES` by `install(EXPORT)` enables discovery of
missing dependencies on INTERFACE libraries that we did not previously
diagnose.  This regressed existing projects that relied on such
non-diagnosis.  Although commit 2fc9e482a9 (Evaluation of
TRANSITIVE_LINK_PROPERTIES isn't considered a usage, 2024-07-05) fixed
this, it also made a significant change to the `UseTo` infrastructure
that may have other subtle effects.  Replace the fix with an approach
that explicitly models suppression of the relevant diagnostics.

Fixes: #26108
2024-07-15 14:08:10 -04:00
Kyle Edwards
b9e2f6828f Merge topic 'TRANSITIVE_LINK_PROPERTIES_isnt_usage' into release-3.30
2fc9e482a9 Evaluation of TRANSITIVE_LINK_PROPERTIES isn't considered a usage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9643
2024-07-08 10:04:22 -04:00
Craig Scott
b192bf1c1c Merge topic 'fetchcontent-debug-log-level' into release-3.30
8c878b2d2e FetchContent: Fix command echo for DEBUG and TRACE log levels

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9640
2024-07-06 08:28:02 -04:00
Robert Maynard
2fc9e482a9 Evaluation of TRANSITIVE_LINK_PROPERTIES isn't considered a usage
Fixes #26108
2024-07-05 13:16:47 -04:00
Brad King
f00675071f Merge topic 'test-ExternalProject' into release-3.30
fe8dc3012e Tests: Fix RunCMake.ExternalProject when git is not available

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Christoph Grüninger <foss@grueninger.de>
Merge-request: !9639
2024-07-04 10:05:26 -04:00
Craig Scott
8c878b2d2e FetchContent: Fix command echo for DEBUG and TRACE log levels
Fixes: #26111
2024-07-04 21:10:34 +10:00
Brad King
fe8dc3012e Tests: Fix RunCMake.ExternalProject when git is not available
Move Git-dependent test cases added by commit 2ef3bd9186
(ExternalProject: Add TLS version options for https connections,
2024-02-26, v3.30.0-rc1~471^2) into the block of cases that run only
when Git is found.

Fixes: #26104
2024-07-03 10:44:15 -04:00
Brad King
c7232c3a2a Merge topic 'ci-cmake-update' into release-3.30
1fe21da240 ci: Update CMake version to 3.30.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9638
2024-07-03 08:27:41 -04:00
Brad King
1fe21da240 ci: Update CMake version to 3.30.0 2024-07-02 13:01:39 -04:00
Brad King
0f88f57389 CMake 3.30.0 v3.30.0 2024-07-02 10:40:35 -04:00
Brad King
e1050b6298 Merge branch 'release-3.29' into release-3.30 2024-07-02 08:07:57 -04:00
Brad King
ee6ff50cba Merge branch 'release-3.28' into release-3.29 2024-07-02 08:07:43 -04:00
Brad King
012bca3ccb Merge topic 'ctest-windows-std-handles' into release-3.28
e4d0169107 ctest: Fix spurious build failures with CTEST_USE_LAUNCHERS on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9598
2024-07-02 08:07:09 -04:00
Brad King
9f1fd88e44 Merge topic 'fix-doc-manual-cmake-cxxmodules' into release-3.30
727d25152b Help: Fix typo in cmake-cxxmodules(7) note syntax

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !9625
2024-06-27 11:08:06 -04:00
權少
727d25152b Help: Fix typo in cmake-cxxmodules(7) note syntax
Fix a typo from commit 5bbd2c12db (Help/cmake-cxxmodules: describe the
compilation strategy, 2024-03-26, v3.30.0-rc1~251^2~22).
2024-06-26 09:06:17 -04:00
Brad King
6241e47184 Merge topic 'ci-cmake-update' into release-3.30
bd84ed18a7 ci: Update CMake version to 3.30.0-rc4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9624
2024-06-26 08:37:40 -04:00
Brad King
bd84ed18a7 ci: Update CMake version to 3.30.0-rc4 2024-06-24 14:30:04 -04:00