summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.26.0-rc4v3.26.0-rc4Brad King2023-02-221-1/+1
|
* Merge topic 'BundleUtilities-chmod-later' into release-3.26Brad King2023-02-211-4/+3
|\ | | | | | | | | | | | | | | | | 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
| * BundleUtilities: Avoid unnecessary chmod in fixup_bundle_itemBrad King2023-02-201-4/+3
| | | | | | | | | | | | | | | | | | | | | | 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
* | Merge topic 'FindOpenSSL-threads' into release-3.26Brad King2023-02-211-6/+14
|\ \ | |/ |/| | | | | | | | | | | | | 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
| * FindOpenSSL: Fix regression in dependency on threadsBrad King2023-02-201-6/+14
|/ | | | | | | | | 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
* Merge topic 'xcode-revert-header-map' into release-3.26Brad King2023-02-205-0/+15
|\ | | | | | | | | | | | | 841272eb35 Xcode: Restore suppression of header maps Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8218
| * Xcode: Restore suppression of header mapsBrad King2023-02-175-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge topic 'cxx-module-mapper-clang' into release-3.26Brad King2023-02-201-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | cmCxxModuleMapper: Specify clang's BMI dependency with new formChuanqi Xu2023-02-171-1/+1
| | |
* | | Merge branch 'release-3.25' into release-3.26Brad King2023-02-170-0/+0
|\ \ \ | |/ / |/| |
| * | Merge topic 'backport-3.25-curl-noproxy-fix' into release-3.25Brad King2023-02-171-10/+35
| |\ \ | | | | | | | | | | | | | | | | | | | | ccdc358f49 curl: Backport upstream curl fixes for no_proxy to CMake 3.25 release Merge-request: !8223
| | * | curl: Backport upstream curl fixes for no_proxy to CMake 3.25 releaseBrad King2023-02-171-10/+35
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge topic 'update-nghttp2' into release-3.26Brad King2023-02-175-17/+8
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge branch 'upstream-nghttp2' into update-nghttp2Brad King2023-02-163-12/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | # By nghttp2 upstream * upstream-nghttp2: nghttp2 2023-02-13 (be049129)
| | * | nghttp2 2023-02-13 (be049129)nghttp2 upstream2023-02-163-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/nghttp2/nghttp2.git at commit be0491294a63d891bd12b6b1b7e372a45a5d0ffe (v1.52.0).
| * | | nghttp2: Update script to get nghttp2 1.52.0Brad King2023-02-161-2/+2
| | | |
| * | | Merge branch 'upstream-nghttp2' into update-nghttp2Brad King2023-02-161-2/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | # By nghttp2 upstream * upstream-nghttp2: nghttp2 2022-09-21 (87fef4ab)
| | * | nghttp2 2022-09-21 (87fef4ab)nghttp2 upstream2023-02-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/nghttp2/nghttp2.git at commit 87fef4ab71bebb2168f8d3d554df8d2f0f01f497 (v1.50.0).
| * | | nghttp2: Update import script to fix version headerBrad King2023-02-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | nghttp2: Drop unused configuration value from build within CMakeBrad King2023-02-161-3/+0
|/ / / | | | | | | | | | | | | 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`.
* | | Merge topic 'ci-cxx-modules-clang' into release-3.26Brad King2023-02-163-7/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 65ff605e44 ci: use the latest clang-scan-deps options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8208
| * | | ci: use the latest clang-scan-deps optionsKefu Chai2023-02-153-7/+8
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | CMake 3.26.0-rc3v3.26.0-rc3Brad King2023-02-151-1/+1
| | |
* | | Merge topic 'LLVMFlang-post-preprocessed' into release-3.26Brad King2023-02-151-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | LLVMFlang: Fix post-preprocess compile for fixed-form FortranDavid Truby2023-02-141-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge topic 'lcc-major-version' into release-3.26Brad King2023-02-142-8/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2a75edb342 LCC: Fix extraction of __LCC__ version components Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8199
| * | | LCC: Fix extraction of __LCC__ version componentsBrad King2023-02-132-8/+4
|/ / / | | | | | | | | | | | | Previously the logic only worked for major versions of the form `1.xx`. Fix it to work with versions `2.xx` and above.
* | | Merge topic 'test-https-connections' into release-3.26Brad King2023-02-1115-1/+37
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | ci: Enable file(DOWNLOAD) TLS_VERIFY test case in CI jobsBrad King2023-02-109-0/+9
| | | |
| * | | Tests: Add test for file(DOWNLOAD) with TLS_VERIFYscivision2023-02-106-1/+28
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge topic 'curl-macos-tls' into release-3.26Brad King2023-02-101-40/+88
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0d312728eb curl: Backport upstream fix for SecureTransport on macOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8193
| * | | curl: Backport upstream fix for SecureTransport on macOSBrad King2023-02-091-40/+88
|/ / / | | | | | | | | | | | | | | | | | | Backport upstream curl commit `16bb32e104d` (sectransp: fix for incomplete read/writes, 2023-01-05) to fix TLS support on macOS. Fixes: #24398
* | | CMake 3.26.0-rc2v3.26.0-rc2Brad King2023-02-091-1/+1
| | |
* | | Merge topic 'doc-configure-log' into release-3.26Brad King2023-02-091-6/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2311b0a7f7 Help: Clarify that the documented configure log location is not stable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8191
| * | | Help: Clarify that the documented configure log location is not stableBrad King2023-02-091-6/+12
|/ / / | | | | | | | | | Issue: #23200
* | | Merge topic 'clarify-clang-tidy-export-fixes-doc' into release-3.26Brad King2023-02-091-6/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f9d9258d5c Help: Avoid making guarantees about <LANG>_CLANG_TIDY_EXPORT_FIXES_DIR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8189
| * | | Help: Avoid making guarantees about <LANG>_CLANG_TIDY_EXPORT_FIXES_DIRKyle Edwards2023-02-091-6/+6
|/ / / | | | | | | | | | | | | | | | 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.
* | | Merge topic 'curl-windows-restore-tls1.3' into release-3.26Brad King2023-02-091-7/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | curl: Enable schannel TLS 1.3 support on Windows 11Brad King2023-02-081-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge topic 'doc-find_package-root-case' into release-3.26Brad King2023-02-093-9/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20e727a408 Help: Clarify that <PackageName>_ROOT variable names are case-preserved Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8182
| * | | | Help: Clarify that <PackageName>_ROOT variable names are case-preservedBrad King2023-02-083-9/+10
| |/ / / | | | | | | | | | | | | | | | | The name comes from the case-preserved first argument to `find_package`.
* | | | Merge topic 'stop_parsing_after_first_script_arg' into release-3.26Brad King2023-02-093-5/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f9e8a067c2 cmake: Stop parsing after `--` when detecting script mode Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8186
| * | | | cmake: Stop parsing after `--` when detecting script modeRobert Maynard2023-02-083-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge topic 'target-runtime-dlls-doc' into release-3.26Kyle Edwards2023-02-091-3/+3
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | e0335f5830 Help: Update $<TARGET_RUNTIME_DLLS> docs to use cmake -E copy -t Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8185
| * | | | Help: Update $<TARGET_RUNTIME_DLLS> docs to use cmake -E copy -tKyle Edwards2023-02-081-3/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | The -t argument was added to support using $<TARGET_RUNTIME_DLLS> in the case that no DLLs are needed. Update the documentation accordingly.
* | | | Merge topic 'automoc-message-typo' into release-3.26Brad King2023-02-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d0f49327f9 AutoMoc: Fix verbose mode message Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8171
| * | | | AutoMoc: Fix verbose mode messageJoerg Bornemann2023-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | AutoMoc generates because moc settings changed, not uic.
* | | | | Merge topic 'findopenssl-static-findpkg-fix' into release-3.26Brad King2023-02-081-2/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | FindOpenSSL: Use static pkgconfig if OPENSSL_USE_STATIC_LIBS=ONKyle Edwards2023-02-071-2/+8
| |/ / / / | | | | | | | | | | | | | | | Fixes: #24395
* | | | | Merge topic 'doc-FetchContent-catch2' into release-3.26Brad King2023-02-082-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d48f48d5d FetchContent: Bump documented example Catch2 to v3.0.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8172