Commit Graph

60859 Commits

Author SHA1 Message Date
Brad King 67a1e2a5d1 CMake 3.26.0-rc4 v3.26.0-rc4 2023-02-22 10:06:26 -05:00
Brad King 70ecc3c36a Merge topic 'BundleUtilities-chmod-later' into release-3.26
1430f7f574 BundleUtilities: Avoid unnecessary chmod in fixup_bundle_item

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !8232
2023-02-21 08:38:59 -05:00
Brad King 03ebceb1a3 Merge topic 'FindOpenSSL-threads' into release-3.26
a8cedb1572 FindOpenSSL: Fix regression in dependency on threads

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Bret Brown <mail@bretbrownjr.com>
Acked-by: Matias Lopez <imatlopez@gmail.com>
Merge-request: !8230
2023-02-21 08:37:49 -05:00
Brad King 1430f7f574 BundleUtilities: Avoid unnecessary chmod in fixup_bundle_item
Move the permissions modification added by commit 88fed668b1 (Make
bundle items writable before fixup, 2010-09-07, v2.8.3~129^2) inside the
condition added by commit 45ed314bff (BundleUtilities: do not run
install_name_tool on scripts, 2020-07-27, v3.19.0-rc1~404^2).
There is no reason to add write permissions to a file that we are
not going to modify.

Fixes: #24424
2023-02-20 13:17:04 -05:00
Brad King a8cedb1572 FindOpenSSL: Fix regression in dependency on threads
Since commit 1b7804edd0 (FindOpenSSL: use extra dependencies from
pkg-config as well, 2022-12-05, v3.26.0-rc1~227^2) we conditionally find
Threads but unconditionally depend on it.  Make the conditions
consistent.

Fixes: #24505
2023-02-20 10:53:42 -05:00
Brad King 3b3f2e920b Merge topic 'xcode-revert-header-map' into release-3.26
841272eb35 Xcode: Restore suppression of header maps

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8218
2023-02-20 08:32:10 -05:00
Brad King 1faf907f84 Merge topic 'cxx-module-mapper-clang' into release-3.26
195ee13710 cmCxxModuleMapper: Specify clang's BMI dependency with new form

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Acked-by: Alex <leha-bot@yandex.ru>
Merge-request: !8219
2023-02-20 08:30:38 -05:00
Brad King 841272eb35 Xcode: Restore suppression of header maps
In commit 8527f42b96 (Xcode: Explicitly disable deprecated user include
path feature, 2023-01-31, v3.26.0-rc1~7^2) we dropped the Xcode build
setting `USE_HEADERMAP = NO` because Xcode 14's "Build Documentation"
feature (`xcodebuild RUN_DOCUMENTATION_COMPILER=YES`) fails in some
cases without header maps.  However, enabling header maps causes Xcode
to add `-iquote .../foo.hmap` and `-I .../bar.hmap` flags that can
change the intended header file search order based on the contents of
the header maps.  This can break existing projects.  Restore the
`USE_HEADERMAP = NO` setting to fix the header file search order.

Further investigation will be needed to resolve the problematic cases
with the Xcode 14 "Build Documentation" feature.  Meanwhile projects
encountering such cases can set the `XCODE_ATTRIBUTE_USE_HEADERMAP`
target property to `YES` themselves.

Fixes: #24418
Issue: #24379
2023-02-17 18:02:45 -05:00
Brad King d08b1e68fe Merge branch 'release-3.25' into release-3.26 2023-02-17 14:00:12 -05:00
Brad King e2f1d6e7bd Merge topic 'backport-3.25-curl-noproxy-fix' into release-3.25
ccdc358f49 curl: Backport upstream curl fixes for no_proxy to CMake 3.25 release

Merge-request: !8223
2023-02-17 13:58:45 -05:00
Brad King ccdc358f49 curl: Backport upstream curl fixes for no_proxy to CMake 3.25 release
CMake 3.25 updated to curl 7.86, which had some `no_proxy` regressions.
Backport upstream curl fixes:

* commit `b830f9ba9` (noproxy: fix tail-matching)
* commit `b1953c193` (noproxy: tailmatch like in 7.85.0 and earlier)
* commit `60453483b` (noproxy: guard against empty hostnames)

CMake 3.26 already updated to curl 7.87, and has the fixes.

Fixes: #24426
2023-02-17 13:51:03 -05:00
Chuanqi Xu 195ee13710 cmCxxModuleMapper: Specify clang's BMI dependency with new form 2023-02-17 12:27:37 -05:00
Brad King f301108f56 Merge topic 'update-nghttp2' into release-3.26
5872d9bd4d Merge branch 'upstream-nghttp2' into update-nghttp2
7eee97387a nghttp2 2023-02-13 (be049129)
b9221fcc17 nghttp2: Update script to get nghttp2 1.52.0
36d31dc996 Merge branch 'upstream-nghttp2' into update-nghttp2
2355f50277 nghttp2 2022-09-21 (87fef4ab)
1ca53784ca nghttp2: Update import script to fix version header
bfca444b92 nghttp2: Drop unused configuration value from build within CMake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8217
2023-02-17 08:51:50 -05:00
Brad King 5872d9bd4d Merge branch 'upstream-nghttp2' into update-nghttp2
# By nghttp2 upstream
* upstream-nghttp2:
  nghttp2 2023-02-13 (be049129)
2023-02-16 15:24:14 -05:00
nghttp2 upstream 7eee97387a nghttp2 2023-02-13 (be049129)
Code extracted from:

    https://github.com/nghttp2/nghttp2.git

at commit be0491294a63d891bd12b6b1b7e372a45a5d0ffe (v1.52.0).
2023-02-16 15:24:13 -05:00
Brad King b9221fcc17 nghttp2: Update script to get nghttp2 1.52.0 2023-02-16 15:23:56 -05:00
nghttp2 upstream 2355f50277 nghttp2 2022-09-21 (87fef4ab)
Code extracted from:

    https://github.com/nghttp2/nghttp2.git

at commit 87fef4ab71bebb2168f8d3d554df8d2f0f01f497 (v1.50.0).
2023-02-16 15:22:28 -05:00
Brad King 36d31dc996 Merge branch 'upstream-nghttp2' into update-nghttp2
# By nghttp2 upstream
* upstream-nghttp2:
  nghttp2 2022-09-21 (87fef4ab)
2023-02-16 15:22:28 -05:00
Brad King 1ca53784ca nghttp2: Update import script to fix version header
In commit 66c9536775 (nghttp2: Update script to get nghttp2 1.50.0,
2022-10-31, v3.26.0-rc1~455^2~2) we forgot to update the `nghttp2ver.h`
replacements to provide the proper `NGHTTP2_VERSION_NUM`.  This causes
our build of curl to think it is using a different version of nghttp2
than we provide.  Fix the version and add a reminder comment.

Issue: #24419
2023-02-16 15:21:38 -05:00
Brad King bfca444b92 nghttp2: Drop unused configuration value from build within CMake
Since commit 7ce2a682a3 (nghttp2 2022-09-21 (87fef4ab), 2022-09-21,
v3.26.0-rc1~455^2~1^2) we do not need `SIZEOF_INT_P`.
2023-02-16 15:13:52 -05:00
Brad King 2a758e34ea Merge topic 'ci-cxx-modules-clang' into release-3.26
65ff605e44 ci: use the latest clang-scan-deps options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8208
2023-02-16 11:20:49 -05:00
Kefu Chai 65ff605e44 ci: use the latest clang-scan-deps options
P1689 support has been merged in Clang trunk and Clang 16 branch, so we
are now able to use the finalized clang-scan-deps command line options.

See also llvm-project's clang/test/ClangScanDeps/P1689.cppm [1] for the
samples of clang-scan-deps usages.

[1] https://github.com/llvm/llvm-project/blob/6d859df46e/clang/test/ClangScanDeps/P1689.cppm

Signed-off-by: Kefu Chai <kefu.chai@scylladb.com>
2023-02-15 14:40:11 -05:00
Brad King 037975ef69 CMake 3.26.0-rc3 v3.26.0-rc3 2023-02-15 09:34:02 -05:00
Brad King bcf60b6d3d Merge topic 'LLVMFlang-post-preprocessed' into release-3.26
3f1e58c5b9 LLVMFlang: Fix post-preprocess compile for fixed-form Fortran

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Andrzej Warzyński <andrzej.warzynski@gmail.com>
Merge-request: !8205
2023-02-15 09:00:10 -05:00
David Truby 3f1e58c5b9 LLVMFlang: Fix post-preprocess compile for fixed-form Fortran
LLVM Flang's preprocessor output is always valid fixed form Fortran with
a fixed line length of 72. If an application tries to use fixed form
with a different line length, this will fail in the
post-preprocessing compilation step as they will pass a flag asking for
a different fixed line length.

To fix this we can pass -ffixed-line-length-72 to the post-preprocess
compilation stage. This will be ignored when the input is free form
Fortran, and force to a 72 line length when the input is fixed.
2023-02-14 09:22:12 -05:00
Brad King d18dd364d3 Merge topic 'lcc-major-version' into release-3.26
2a75edb342 LCC: Fix extraction of __LCC__ version components

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8199
2023-02-14 08:46:17 -05:00
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