Commit Graph

67329 Commits

Author SHA1 Message Date
Brad King 0acff8e622 Merge topic 'curl-tls-version'
5d2ea8371d Tests/RunCMake/file-DOWNLOAD: Add case covering TLS_VERSION values
c864ffceb7 Tests/RunCMake/file-DOWNLOAD: Clarify name of invalid TLS_VERSION case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9845
2024-09-25 09:03:34 -04:00
Brad King 506255b1f1 Merge topic 'nested_linker_prefixes'
e3895f4a8b Linking: Preserve nested LINKER: prefixes as written
4185dfbe1b Tests/LINK_OPTIONS: extract common code in test (NFC)
54381b5a81 Linking: extract wrapping linker options to a lambda (NFC)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9823
2024-09-25 08:58:26 -04:00
Kitware Robot 57480c7676 CMake Nightly Date Stamp 2024-09-25 00:01:15 -04:00
Brad King 5d2ea8371d Tests/RunCMake/file-DOWNLOAD: Add case covering TLS_VERSION values 2024-09-24 12:37:45 -04:00
Brad King c864ffceb7 Tests/RunCMake/file-DOWNLOAD: Clarify name of invalid TLS_VERSION case
The test case is about an invalid version specification,
not a TLS version unsupported by the server.
2024-09-24 11:59:55 -04:00
Brad King ea3405ff60 Merge topic 'curl-tls-verify'
4e62bc943c ctest: Verify TLS server certificate by default
8e92ee34f6 file(DOWNLOAD/UPLOAD): Verify TLS server certificate by default
dcaea54898 cmCTestCurl: Clarify names and logic using optional<bool>
03d37ae3ff cmFileCommand: Clarify names and logic using optional<bool>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9843
2024-09-24 10:35:19 -04:00
Brad King 30d3df00c7 Merge topic 'FindOpenMP-test-link'
795be0f55f Tests/FindOpenMP: Verify linking to OpenMP libraries
6f136808a9 Tests/FindOpenMP: Add label for Fortran when it is enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9844
2024-09-24 10:33:54 -04:00
Brad King 4e62bc943c ctest: Verify TLS server certificate by default
Issue: #23608
2024-09-24 08:37:23 -04:00
Brad King 8e92ee34f6 file(DOWNLOAD/UPLOAD): Verify TLS server certificate by default
If the connection fails in a way that might be a certificate error, and
verification was enabled by the new default, mention environment
variable `CMAKE_TLS_VERIFY` in the diagnostic to help users that were
relying on the old behavior turn off server certificate verification in
their environment.

Fixes: #23608
2024-09-24 08:37:23 -04:00
Brad King dcaea54898 cmCTestCurl: Clarify names and logic using optional<bool> 2024-09-24 08:37:23 -04:00
Brad King 03d37ae3ff cmFileCommand: Clarify names and logic using optional<bool> 2024-09-24 08:36:30 -04:00
Kitware Robot b5ccbe2252 CMake Nightly Date Stamp 2024-09-24 00:01:26 -04:00
Brad King 795be0f55f Tests/FindOpenMP: Verify linking to OpenMP libraries
Previously we only verified the `_OPENMP` preprocessor symbol.
2024-09-23 15:52:12 -04:00
Brad King 6f136808a9 Tests/FindOpenMP: Add label for Fortran when it is enabled 2024-09-23 15:17:34 -04:00
Brad King ee151bccfe Merge topic 'cuda-host-compiler-id'
3b4d0df670 NVCC: Detect host compiler id and version
38cacd83a5 Tests: Migrate compiler id tests to RunCMake infrastructure
37173f1ccc Tests/RunCMake: Generalize construction of arguments for languages to test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !9841
2024-09-23 14:18:57 -04:00
Brad King b24c5ae8ac Merge topic 'FindJPEG-doc'
698ea5bd94 FindJPEG: Fix documentation of include directory input variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9840
2024-09-23 14:16:15 -04:00
Brad King 0008da1401 Merge topic 'FindBZip2-doc'
9d7280b6a7 FindBZip2: Document library input variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9839
2024-09-23 14:15:27 -04:00
Brad King 7b753cb319 Merge branch 'release-3.30' 2024-09-23 14:13:57 -04:00
Brad King 75769719bd Merge topic 'project-vars'
c5f7e3bc3b Merge branch 'backport-project-vars' into project-vars
86ad7cc886 project: Only define non-cache vars if already defined
4c152752da Help: State valid scopes for using proj_SOURCE_DIR and proj_BINARY_DIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9820
2024-09-23 14:13:57 -04:00
Brad King 3c2605dece Merge topic 'project-vars' into release-3.30
86ad7cc886 project: Only define non-cache vars if already defined
4c152752da Help: State valid scopes for using proj_SOURCE_DIR and proj_BINARY_DIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9820
2024-09-23 14:13:56 -04:00
Gergely Meszaros e3895f4a8b Linking: Preserve nested LINKER: prefixes as written
Previously LINKER:,-Xlinker and -Wl, options nested inside LINKER:
prefixes would be transformed to separate prefixed options.
This is confusing and undocumented behavior, instead preserve these
as written.

Fixes: #26298
2024-09-23 02:17:19 -07:00
Kitware Robot b684ebf6ad CMake Nightly Date Stamp 2024-09-23 00:02:56 -04:00
Kitware Robot 926f43d0f6 CMake Nightly Date Stamp 2024-09-22 00:01:16 -04:00
Kitware Robot ddd40a43ab CMake Nightly Date Stamp 2024-09-21 00:02:01 -04:00
Brad King 3b4d0df670 NVCC: Detect host compiler id and version
Report them in `CMAKE_<LANG>_HOST_COMPILER_{ID,VERSION}` variables.

Fixes: #20901
2024-09-20 17:48:33 -04:00
Brad King 38cacd83a5 Tests: Migrate compiler id tests to RunCMake infrastructure 2024-09-20 17:48:07 -04:00
Brad King 37173f1ccc Tests/RunCMake: Generalize construction of arguments for languages to test 2024-09-20 15:08:17 -04:00
Brad King 9d7280b6a7 FindBZip2: Document library input variables
Since commit 5b6ca9fa3f (FindBZip2: add support for debug libraries,
2012-01-10, v2.8.8~267^2) the `find_library` commands store results in
per-config library variables.  Document them.
2024-09-20 12:06:54 -04:00
Brad King 698ea5bd94 FindJPEG: Fix documentation of include directory input variable 2024-09-20 12:03:08 -04:00
Brad King c5f7e3bc3b Merge branch 'backport-project-vars' into project-vars 2024-09-20 10:35:02 -04:00
Craig Scott 86ad7cc886 project: Only define non-cache vars if already defined
In c1ece78d11 (project: non cache <project> prefix variables are
also created, 2024-08-27), we started explicitly setting the non-cache
variable for <projectName>_SOURCE_DIR, <projectName>_BINARY_DIR,
and <projectName>_IS_TOP_LEVEL in addition to setting them as
cache variables. This changed the behavior when a project name
was used more than once, and the second project call happens in
the same scope or a child scope of the first. Previously, the first
project call would set cache variables, and the second project call
would not overwrite those cache variables. With the change in
c1ece78d11, after the second project call the non-cache variables
would mask the cache variables and the project code would see
a different value to what it did before.

Setting the non-cache variable was added to handle the case where
a call to FetchContent_MakeAvailable() would set some non-cache
variables, and it just so happened those matched the same cache
variables that the project() command would set in the project being
fetched. The fetched project would then see a different set of
project-specific variables compared to when it was built standalone.

This commit here narrows the change from c1ece78d11 such that
the non-cache variable is only set by project() if there was already
a non-cache variable set. This still fixes the motivating problem
c1ece78d11 was intended to solve, but it avoids changing the variable
values seen by a project that re-uses the same project name in related scopes.

Issue: #26243, #25714
Fixes: #26281
2024-09-20 10:33:25 -04:00
Craig Scott 4c152752da Help: State valid scopes for using proj_SOURCE_DIR and proj_BINARY_DIR
Issue: #25714
2024-09-20 10:33:25 -04:00
Brad King fdceee50e6 Merge topic 'normalize-install-destination-paths'
6a1fac1450 install: Normalize DESTINATION paths
2184fcfb00 Tests: Configure RunCMake.install cases with correct build type
5a8a6dfe81 cmGeneratorExpression: Change Find() parameter type to cm::string_view
d810374b3d install(PACKAGE_INFO): Remove outdated TODO comment
d13ed01d54 Tests: Remove unused files from RunCMake.install

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9800
2024-09-20 10:27:30 -04:00
Brad King ac8738c077 Merge topic 'update-kwsys'
c89c49d67b Merge branch 'upstream-KWSys' into update-kwsys
5c18d48fda KWSys 2024-09-19 (2d72c140)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9833
2024-09-20 10:12:11 -04:00
Brad King 7fe17adf8d Merge topic 'ci-clang19-windows'
96bcf7db16 ci: Update LLVM/Clang to 19.1 in nightly CI jobs on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9834
2024-09-20 10:11:03 -04:00
Brad King 2cfe2ac0c7 Merge topic 'update-curl'
022d16659b curl: Work around missing OpenSSL symbol with LCC 1.23
01dde28dab ci: curl with Secure Transport on macOS does not support TLS 1.3
da52e4e571 curl: Set build options the way we need for CMake
ce908c42a3 Merge branch 'upstream-curl' into update-curl
1a2b208170 curl 2024-09-18 (7eb8c048)
862bd5defc curl: Update script to get curl 8.10.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9832
2024-09-20 10:09:47 -04:00
Brad King ce8cd49dd7 Merge topic 'update-libarchive'
387a9a746a libarchive: tar: fix memory leaks when reading symlinks or parsing pax headers
dad12c8010 libarchive: Set build options the way we need for CMake
21affa271e Utilities: Update hard-coded try_compile results for libarchive 3.7.5
fe3f0d469f Merge branch 'upstream-LibArchive' into update-libarchive
9539a0df9c LibArchive 2024-09-13 (12ecf841)
dfbb1f2f0d libarchive: Update script to get 3.7.5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9826
2024-09-20 10:07:48 -04:00
Brad King 1226c92515 Merge branch 'release-3.30' 2024-09-20 10:05:54 -04:00
Brad King 4aca6d8327 Merge topic 'cpack-nuget-native'
c358872976 CPack/NuGet: Add native0.0 to build dependencies in groups

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9829
2024-09-20 10:05:53 -04:00
Brad King 6323fdc9cf Merge topic 'cpack-nuget-native' into release-3.30
c358872976 CPack/NuGet: Add native0.0 to build dependencies in groups

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9829
2024-09-20 10:05:52 -04:00
Brad King 5a2f10946b Merge branch 'release-3.30' 2024-09-20 10:04:22 -04:00
Brad King e8597f2b09 Merge topic 'FindMatlab-mcr'
9ceca05e6b FindMatlab: Search mex and mx libraries for MCR
67e3c6b6eb FindMatlab: Cache whether MATLAB root contains MCR or MATLAB
b426ce1d04 FindMatlab: Add support for MCR distributions without mex.h
cd4782bac3 FindMatlab: Only consider versioned MCR subdirectory if it exists

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9831
2024-09-20 10:04:21 -04:00
Brad King 304c47a7c1 Merge topic 'FindMatlab-mcr' into release-3.30
9ceca05e6b FindMatlab: Search mex and mx libraries for MCR
67e3c6b6eb FindMatlab: Cache whether MATLAB root contains MCR or MATLAB
b426ce1d04 FindMatlab: Add support for MCR distributions without mex.h
cd4782bac3 FindMatlab: Only consider versioned MCR subdirectory if it exists

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9831
2024-09-20 10:04:20 -04:00
Brad King 33ca41ed12 Merge branch 'release-3.30' 2024-09-20 10:02:54 -04:00
Brad King b9eb9cfbac Merge topic 'ci-xcode-16.0'
cc293b4963 ci: Run RunCMake.ExternalProject serially in macos-x86_64 Xcode job
26359076c8 gitlab-ci: update macOS jobs to use Xcode 16.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9830
2024-09-20 10:02:53 -04:00
Brad King c544ad8725 Merge topic 'ci-xcode-16.0' into release-3.30
cc293b4963 ci: Run RunCMake.ExternalProject serially in macos-x86_64 Xcode job
26359076c8 gitlab-ci: update macOS jobs to use Xcode 16.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9830
2024-09-20 10:02:52 -04:00
Kitware Robot 7e26c7cad9 CMake Nightly Date Stamp 2024-09-20 00:01:19 -04:00
Brad King 96bcf7db16 ci: Update LLVM/Clang to 19.1 in nightly CI jobs on Windows 2024-09-19 11:58:41 -04:00
Brad King c89c49d67b Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2024-09-19 (2d72c140)
2024-09-19 11:34:52 -04:00
KWSys Upstream 5c18d48fda KWSys 2024-09-19 (2d72c140)
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 2d72c140191cfeb1e5bf447683dac2c222603207 (master).

Upstream Shortlog
-----------------

Mike Lundy (1):
      ee3223d7 SystemTools: fix clonefile optimization on macOS
2024-09-19 11:34:52 -04:00