mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-04 21:30:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
60,833 Commits 2 Branches 401 Tags
2a75edb3421fcceb3fb6d3a2ea07f931184ff8af
Commit Graph

60833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 2a75edb342 LCC: Fix extraction of __LCC__ version components 
Previously the logic only worked for major versions of the form `1.xx`.
Fix it to work with versions `2.xx` and above.
 2023-02-13 09:29:32 -05:00
Brad King e66bd7f584 Merge topic 'test-https-connections' into release-3.26 
3350c17451 ci: Enable file(DOWNLOAD) TLS_VERIFY test case in CI jobs
17b47da3d8 Tests: Add test for file(DOWNLOAD) with TLS_VERIFY

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8194
 2023-02-11 06:33:19 -05:00
Brad King 3350c17451 ci: Enable file(DOWNLOAD) TLS_VERIFY test case in CI jobs 2023-02-10 12:22:00 -05:00
scivision 17b47da3d8 Tests: Add test for file(DOWNLOAD) with TLS_VERIFY 
Occasionally curl updates introduce errors in https verification.
Add an explicit test for this capability, activated by an undocumented
option that we can use in CI to specify a URL to test.

Co-authored-by: Brad King <brad.king@kitware.com>
Fixes: #24405
Issue: #24147
Issue: #24398
 2023-02-10 12:22:00 -05:00
Brad King 9b7d086220 Merge topic 'curl-macos-tls' into release-3.26 
0d312728eb curl: Backport upstream fix for SecureTransport on macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8193
 2023-02-10 09:58:48 -05:00
Brad King 0d312728eb curl: Backport upstream fix for SecureTransport on macOS 
Backport upstream curl commit `16bb32e104d` (sectransp: fix for
incomplete read/writes, 2023-01-05) to fix TLS support on macOS.

Fixes: #24398
 2023-02-09 16:54:25 -05:00
Brad King 29bcbcab4f CMake 3.26.0-rc2 v3.26.0-rc2 2023-02-09 14:21:24 -05:00
Brad King 2dac3887da Merge topic 'doc-configure-log' into release-3.26 
2311b0a7f7 Help: Clarify that the documented configure log location is not stable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8191
 2023-02-09 14:19:41 -05:00
Brad King 2311b0a7f7 Help: Clarify that the documented configure log location is not stable 
Issue: #23200
 2023-02-09 13:39:49 -05:00
Brad King 5a402f4999 Merge topic 'clarify-clang-tidy-export-fixes-doc' into release-3.26 
f9d9258d5c Help: Avoid making guarantees about <LANG>_CLANG_TIDY_EXPORT_FIXES_DIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8189
 2023-02-09 13:23:01 -05:00
Kyle Edwards f9d9258d5c Help: Avoid making guarantees about <LANG>_CLANG_TIDY_EXPORT_FIXES_DIR 
Rather than stating specifically which files may be written or deleted,
simply state that CMake owns the directory and that a dedicated
directory should be used for exporting the fixes.
 2023-02-09 11:41:48 -05:00
Brad King f9ccb7fada Merge topic 'curl-windows-restore-tls1.3' into release-3.26 
8675d8bdb0 curl: Enable schannel TLS 1.3 support on Windows 11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8184
 2023-02-09 10:10:18 -05:00
Brad King 0a95c3579b Merge topic 'doc-find_package-root-case' into release-3.26 
20e727a408 Help: Clarify that <PackageName>_ROOT variable names are case-preserved

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8182
 2023-02-09 10:01:51 -05:00
Brad King 7f90210dd6 Merge topic 'stop_parsing_after_first_script_arg' into release-3.26 
f9e8a067c2 cmake: Stop parsing after `--` when detecting script mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8186
 2023-02-09 09:58:13 -05:00
Kyle Edwards e25d3a0d5a Merge topic 'target-runtime-dlls-doc' into release-3.26 
e0335f5830 Help: Update $<TARGET_RUNTIME_DLLS> docs to use cmake -E copy -t

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8185
 2023-02-09 08:45:38 -05:00
Robert Maynard f9e8a067c2 cmake: Stop parsing after -- when detecting script mode 
The fix in commit 08aa516880 (cmake: Stop parsing after `--` when
detecting script mode, 2022-12-06, v3.26.0-rc1~216^2) only corrected the
case where `-P -- -P <arg>` occurred and not `-P -- -P -<other>`.

Fixes: #24220
 2023-02-08 17:21:10 -05:00
Kyle Edwards e0335f5830 Help: Update $<TARGET_RUNTIME_DLLS> docs to use cmake -E copy -t 
The -t argument was added to support using $<TARGET_RUNTIME_DLLS>
in the case that no DLLs are needed. Update the documentation
accordingly.
 2023-02-08 15:10:45 -05:00
Brad King 8675d8bdb0 curl: Enable schannel TLS 1.3 support on Windows 11 
Revert commit c0a4536cec (curl: Disable schannel TLS 1.3 support on
Windows 11, 2022-11-09, v3.25.0~13^2).  The curl bug it avoided was
fixed by upstream curl commit `4f42150d0` (sendf: change Curl_read_plain
to wrap Curl_recv_plain , 2022-11-14, curl-7_87_0~129), which we have
since recently updating to curl 7.87.0.

Issue: #24147
 2023-02-08 14:55:24 -05:00
Brad King 20e727a408 Help: Clarify that <PackageName>_ROOT variable names are case-preserved 
The name comes from the case-preserved first argument to
`find_package`.
 2023-02-08 14:06:38 -05:00
Brad King fc4e31d703 Merge topic 'automoc-message-typo' into release-3.26 
d0f49327f9 AutoMoc: Fix verbose mode message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8171
 2023-02-08 11:39:01 -05:00
Brad King 4ce614eb5a Merge topic 'findopenssl-static-findpkg-fix' into release-3.26 
652f34eab9 FindOpenSSL: Use static pkgconfig if OPENSSL_USE_STATIC_LIBS=ON

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8174
 2023-02-08 11:37:59 -05:00
Brad King c36b18a4b6 Merge topic 'doc-FetchContent-catch2' into release-3.26 
6d48f48d5d FetchContent: Bump documented example Catch2 to v3.0.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8172
 2023-02-08 11:36:25 -05:00
Brad King fd36f3f111 Merge topic 'doc-cpack-generator-fields' into release-3.26 
4cc4be1414 Help: CPack FreeBSD Generator page use field lists
083a57550b Help: CPack DragNDrop Generator page use field lists
2c46fe7c96 Help: CPack Archive Generator page use field lists
5defbf7430 Help: CPack RPM Generator page use field lists
27d45be75d Help: CPack NuGet Generator page use field lists
fbb5ac4735 Help: CPack DEB Generator page use field lists

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8134
 2023-02-08 11:29:51 -05:00
Brad King f950cafcc2 Merge topic 'ci-docker' into release-3.26 
fc8335a17f ci: Reduce Fedora and Debian image sizes even more

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8173
 2023-02-08 10:16:59 -05:00
Alex Turbov fc8335a17f ci: Reduce Fedora and Debian image sizes even more 
Apply the approach from commit 354fdf2116 (ci: Reduce intermediate
docker layers and final image size, 2023-02-01) to more stages.

Also:

* Use cache (prefetch metadata and packages) to reduce network I/O
  and speedup image build.

* Use `tmpfs` to drop logs produced by the package manager.
 2023-02-07 11:58:21 -05:00
Joerg Bornemann d0f49327f9 AutoMoc: Fix verbose mode message 
AutoMoc generates because moc settings changed, not uic.
 2023-02-07 10:59:51 -05:00
Eisuke Kawashima 6d48f48d5d FetchContent: Bump documented example Catch2 to v3.0.1 
The previous Catch2 v2.13.4 does not compile on some platforms [1].

[1] https://github.com/catchorg/Catch2/issues/2326
 2023-02-07 10:54:25 -05:00
Kyle Edwards 652f34eab9 FindOpenSSL: Use static pkgconfig if OPENSSL_USE_STATIC_LIBS=ON 
Fixes: #24395
 2023-02-07 10:38:20 -05:00
Alex Turbov 4cc4be1414 Help: CPack FreeBSD Generator page use field lists 2023-02-07 09:34:58 -05:00
Alex Turbov 083a57550b Help: CPack DragNDrop Generator page use field lists 2023-02-07 09:34:58 -05:00
Alex Turbov 2c46fe7c96 Help: CPack Archive Generator page use field lists 2023-02-07 09:34:58 -05:00
Alex Turbov 5defbf7430 Help: CPack RPM Generator page use field lists 2023-02-07 09:34:58 -05:00
Alex Turbov 27d45be75d Help: CPack NuGet Generator page use field lists 2023-02-07 09:34:58 -05:00
Alex Turbov fbb5ac4735 Help: CPack DEB Generator page use field lists 2023-02-07 09:34:58 -05:00
Brad King 26f962f8b1 Merge branch 'release-3.25' into release-3.26 2023-02-07 09:33:52 -05:00
Brad King 5d40cf45fa Merge topic 'android-ndk-legacy-toolchain' into release-3.26 
cb0b9452e8 Android: Provide CMAKE_ANDROID_NDK_VERSION with NDK legacy toolchain file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8170
 2023-02-07 09:32:19 -05:00
Brad King c323d446d6 Merge topic 'cxxmodules-proper-mangling' into release-3.26 
3f1e005067 Tests/RunCMake/CXXModules: declare `forwarding` as `extern "C++"`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8159
 2023-02-07 09:01:53 -05:00
Brad King 7aee115ff4 Merge topic 'FindCUDAToolkit-nvrtc-builtins' into release-3.26 
9688a8ebc2 FindCUDAToolkit: Fix `nvrtc_builtins_static` library name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8162
 2023-02-07 09:00:35 -05:00
Brad King 33a30da3da Merge topic 'docexe' into release-3.26 
1e95f765d5 Help: Clarify interaction of execute_process *_FILE and *_VARIABLE options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8165
 2023-02-07 08:58:48 -05:00
Brad King 94804e55f5 Merge topic 'docfix' into release-3.26 
d3ece40602 Help: cmake (1): remove -E server as not available
b19036d8b3 Help: CheckSource{Compiles,Runs}: fix typo and clarify

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8164
 2023-02-07 08:57:45 -05:00
Brad King e3593a7a9f Merge topic 'ci-docker-layers' into release-3.26 
354fdf2116 ci: Reduce intermediate docker layers and final image size

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8145
 2023-02-07 08:56:35 -05:00
Brad King 29dc3e7722 Merge branch 'android-ndk-legacy-toolchain' into release-3.25 
Merge-request: !8170
 2023-02-06 17:27:48 -05:00
Brad King cb0b9452e8 Android: Provide CMAKE_ANDROID_NDK_VERSION with NDK legacy toolchain file 
This variable has been provided since commit 746906242d (Android: Detect
NDK version number, 2021-02-26, v3.20.0-rc3~1^2~3) when using CMake's
NDK support or the modern NDK toolchain file.  Since commit 005e2cdfb0
(Android: Do not use gold for ndk >= r22, 2021-02-26, v3.20.0-rc3~1^2)
we need the value in our compiler/platform information files, so provide
it when using the NDK legacy toolchain file too.

Revert commit 1c86e397fe (Android/Clang: Tolerate undefined
CMAKE_ANDROID_NDK_VERSION, 2022-09-16, v3.25.0-rc1~118^2) since the
variable should now always be defined.

Issue: #21772
Fixes: #24386
 2023-02-06 17:17:25 -05:00
Alex Turbov 354fdf2116 ci: Reduce intermediate docker layers and final image size 
Instead of `COPY` to get tar files, execute `RUN` w/ `--mount`.
Note that this requires the docker "buildkit" feature to be enabled.
 2023-02-06 10:13:06 -05:00
scivision d3ece40602 Help: cmake (1): remove -E server as not available 
... since CMake 3.20
 2023-02-06 09:57:57 -05:00
scivision b19036d8b3 Help: CheckSource{Compiles,Runs}: fix typo and clarify 2023-02-06 09:55:23 -05:00
scivision 1e95f765d5 Help: Clarify interaction of execute_process *_FILE and *_VARIABLE options 
These parameters are so important that it's worthwhile to be more
explicit about their interaction.

Fixes: #24392
 2023-02-06 09:47:52 -05:00
Paul Taylor 9688a8ebc2 FindCUDAToolkit: Fix nvrtc_builtins_static library name 
Update the change from commit 2a94c762ed (FindCUDAToolkit: Add support
for CUDA::nvrtc_static, 2023-01-20, v3.26.0-rc1~55^2).  The lib is named
`libnvrtc-builtins_static.a`, not `libnvrtc_builtins_static.a`.
 2023-02-06 09:36:43 -05:00
Ben Boeckel 3f1e005067 Tests/RunCMake/CXXModules: declare forwarding as extern "C++" 
It is not part of any module, so it needs to be declared as such.
 2023-02-03 15:54:11 -05:00
Brad King 2a0c105cf0 CMake 3.26.0-rc1 v3.26.0-rc1 2023-02-02 13:20:23 -05:00