Commit Graph

61023 Commits

Author SHA1 Message Date
Brad King ceb742a8fb CMake 3.26.6 v3.26.6 2023-11-27 13:48:12 -05:00
Brad King 569c1d1b6e Merge branch 'doc-ctest-link-cdash' into release-3.26
Merge-request: !8998
2023-11-21 18:52:31 -05:00
Brad King 486c89dd6a Help: Fix ctest(1) manual links to www.cdash.org
When the link was updated to `https` by commit 52eac4573d (Help: Fix
link to cdash.org from CTest manual, 2021-04-21, v3.21.0-rc1~262^2~2)
the markup was incorrectly adjusted to show the link as part of the
"See Also" section.  It is meant to be the link destination for links
in prose elsewhere in the manual.  Fix the markup and move it to a
clearer location.  Also update the link to resolve a redirect.
2023-11-21 18:46:41 -05:00
Brad King fa272fa91e Merge branch 'fileapi-file-sets-base-dirs-relative' into release-3.26
Merge-request: !8977
2023-11-20 09:11:37 -05:00
Kyle Edwards a3a85524cd fileapi: Fix file sets' base directories relative to top source
This field was added by commit b3e9fb67bb (file-api: support exporting
file set information, 2022-11-03, v3.26.0-rc1~389^2) but the relative
path convention used elsewhere was accidentally left out.

Fixes: #25422
2023-11-17 07:59:05 -05:00
Brad King d6c81467aa Merge branch 'backport-curl-socks5-fix' into release-3.26
Merge-request: !8872
2023-10-12 19:05:59 -04:00
Brad King 244bb7b6bc Merge branch 'backport-ctest_submit-follow-redirects' into release-3.26
Merge-request: !8873
2023-10-12 19:01:53 -04:00
Brad King 701f52670f curl: Backport SOCKS5 heap buffer overflow fix from curl 8.4.0
Backport upstream curl commit `fb4415d8ae` (socks: return error if
hostname too long for remote resolve, 2023-10-11, curl-8_4_0~2) to
address CVE-2023-38545.

Issue: #25329
2023-10-12 15:54:53 -04:00
Zack Galbreath ce661c4399 ctest: Restore support for http redirects during Submit step
After CDash PR 1519 introduced HTTP status codes greater than 200 for
various error cases, CMake commit b7c871f745 (ctest: Update ctest_submit
for CDash behavior change, 2023-07-24, v3.27.1~3^2) modified CTest's
submit handler to check the status returned by CDash and throw an error
when this status is not equal to 200.

That change had the unintended side effect of causing CTest submissions
to fail when uploading results to a URL that returns a redirect status
code (3xx).  Fix this by configuring cURL to follow the redirect.  The
status cURL reports to CTest is now 200 instead of 3xx when CDash is
located behind a redirect.

Fixes: #25159
2023-10-12 15:53:10 -04:00
Brad King 091005fa65 Merge branch 'cdash_checksum_400' into release-3.26
Merge-request: !8648
2023-07-25 09:13:53 -04:00
Zack Galbreath b7c871f745 ctest: Update ctest_submit for CDash behavior change
open.cdash.org was recently upgraded in preparation for the release of
CDash v3.2.0. This upgrade brought a change in behavior where CDash now
responds with HTTP 400 (bad request) rather than HTTP 200 (OK) for MD5
checksum mismatches during submission time.

This commit removes our usage of CURLOPT_FAILONERROR in
cmCTestSubmitHandler.cxx This was necessary to pass along the contents
of the request body ("md5 mismatch") in cases where the web server
(CDash) responds with an error status (400).

Fixes: #25121
2023-07-25 09:09:56 -04:00
Brad King eace51a20c Merge branch 'FindCUDAToolkit-libnvrtc-builtins' into release-3.26
Merge-request: !8642
2023-07-20 11:37:25 -04:00
Tomoharu Kitawaki c2601d01d1 FindCUDAToolkit: Fix nvrtc_builtins library name
The lib is named `libnvrtc-builtins.so`, not `libnvrtc_builtins.so`.

Update the change from commit 2a94c762ed (FindCUDAToolkit: Add support
for CUDA::nvrtc_static, 2023-01-20, v3.26.0-rc1~55^2).  Apply a fix
similar to commit 9688a8ebc2 (FindCUDAToolkit: Fix
`nvrtc_builtins_static` library name, 2023-02-03, v3.26.0-rc2~15^2).
2023-07-20 11:34:47 -04:00
Brad King 01c62f4ff0 CMake 3.26.5 v3.26.5 2023-07-19 13:56:04 -04:00
Brad King 0ef3b9fd76 Merge branch 'armclang-update-version-computation' into release-3.26
Merge-request: !8636
2023-07-18 13:31:12 -04:00
Daniel Brondani 65fac2fa35 ARMClang: Fix computation of compiler semantic version patch level
According to ARMClang documentation 6.20, the patch version number
should not include the last two digits of `__ARMCOMPILER_VERSION`,
which are reserved for internal use by ARM.
2023-07-18 13:29:01 -04:00
Brad King 8c5905ca1c Merge branch 'doc-project-none' into release-3.26
Merge-request: !8585
2023-06-23 10:43:47 -04:00
Brad King 4902fe086b Merge branch 'backport-3.26-sphinx-domain-parallel' into release-3.26
Merge-request: !8575
2023-06-23 10:43:10 -04:00
Brad King 9dd2dd5b77 Help: Restore project command docs for default languages and NONE
In commit b787be2714 (Help: Update supported languages in project and
enable_language, 2023-01-20, v3.26.0-rc1~53^2) the relevant paragraph
was accidentally moved to the `enable_language` command documentation.

Fixes: #25016
2023-06-22 13:12:24 -04:00
Jared Dillard 4e11859e0e Utilities/Sphinx: Fix parallel documentation builds for 3.26
In commit d78bfa1ecc (Utilities/Sphinx: support cmakedomain running in
parallel, 2022-10-24, v3.26.0-rc1~495^2) we declared the domain as
parallel-safe without actually implementing the required
`merge_domaindata` method.

Issue: #24076
2023-06-21 11:52:10 -04:00
Brad King 492bf5e0ac Merge topic 'werror_space_fix' into release-3.26
cec6f98018 CMakeDetermineCompilerABI: Avoid removing the flag after -Werror

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robertjmaynard@gmail.com>
Merge-request: !8518
2023-05-31 09:25:06 -04:00
Raul Tambre cec6f98018 CMakeDetermineCompilerABI: Avoid removing the flag after -Werror
The matching became too eager after commit 079ea66468
(CMakeDetermineCompilerABI: Handle NVCC-style -Werror flags, 2020-10-04,
v3.19.0-rc1~45^2). When -Werror was specified without a value we would
eat the following flag. Prevent this by disallowing "-" as the first
character of the flag's value.

Fixes: 079ea66468
See-also: https://discourse.cmake.org/t/8230
2023-05-30 11:03:09 -04:00
Brad King b50caaf96a Merge topic 'backport-sphinx-file-encoding' into release-3.26
e4f26edc1c Tests: Always load presets schema as UTF-8
fc2b60ca6b Sphinx: Modernize UTF-8 encoding handling when updating CMake.qhp
853f069103 Sphinx: Specify encoding when opening files for title extraction

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8521
2023-05-30 10:59:10 -04:00
Craig Scott e4f26edc1c Tests: Always load presets schema as UTF-8
We know the encoding of the schema file, so we should specify it
when we open it for reading. Previously, by not specifying it, the test
was open to using an encoding based on the active locale when
running the test. We may have been enforcing a "C" locale at a higher
level, but we don't need to rely on that here, we can force correct
behavior without that assumption.

Issue: #24679
2023-05-30 10:32:59 -04:00
Craig Scott fc2b60ca6b Sphinx: Modernize UTF-8 encoding handling when updating CMake.qhp 2023-05-30 10:32:59 -04:00
Craig Scott 853f069103 Sphinx: Specify encoding when opening files for title extraction
When the encoding is not specified, open() may choose an encoding
based on the locale in use. That encoding may have no relationship
to the encoding of the file being opened. Use the locale from the
document settings instead, which should better match the file's
encoding.

Fixes: #24679
2023-05-30 10:32:59 -04:00
Brad King 0926ed1f69 CMake 3.26.4 v3.26.4 2023-05-18 13:49:44 -04:00
Brad King 5855153cec Merge topic 'FindPython-fix-launcher-typo' into release-3.26
31faf3945f FindPython: fix interpreter launcher variable spelling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8487
2023-05-18 09:19:19 -04:00
Ben Boeckel 31faf3945f FindPython: fix interpreter launcher variable spelling
Reported-by: Johannes (#cmake Slack)
2023-05-17 07:02:07 -04:00
Brad King 37f06fad18 Merge topic 'msvc-wine-showIncludes' into release-3.26
fb3c4715cd Ninja: Restore detection of msvc-wine showIncludes prefix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: huangqinjin <huangqinjin@gmail.com>
Merge-request: !8479
2023-05-16 10:40:07 -04:00
Brad King fb3c4715cd Ninja: Restore detection of msvc-wine showIncludes prefix
Since commit 8f82e755f3 (Ninja: Fix detection of MSVC showIncludes
prefix in Italian, 2023-01-26, v3.26.0-rc1~20^2) our regex no longer
matches the output from `msvc-wine`, which uses forward slashes:

    Note: including file: /path/to/foo.h

`cl /showIncludes` under Wine prints paths of the form `Z:\path\to\file`,
but the `msvc-wine` wrapper converts them to the form `/path/to/file` so
that native Ninja can be used.  Update our regex to match the prefix
followed by a path with a leading forward slash.

Fixes: #24908
2023-05-15 15:34:55 -04:00
Brad King 822aa26915 Merge topic 'FindCUDAToolkit_more_library_root_detection' into release-3.26
587c0443cc FindCUDAToolkit: Support CUDA version extraction from version.json

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8451
2023-05-05 12:34:52 -04:00
Robert Maynard 587c0443cc FindCUDAToolkit: Support CUDA version extraction from version.json
Fixes: #24858
2023-05-04 12:26:04 -04:00
Brad King 5532fcb8f9 Merge topic 'findjni_new_ubuntu_versions' into release-3.26
7f738313e0 FindJNI: add Ubuntu specific paths for more recent JDK versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8449
2023-05-02 08:39:51 -04:00
Even Rouault 7f738313e0 FindJNI: add Ubuntu specific paths for more recent JDK versions 2023-05-01 22:26:07 +02:00
Brad King b548c7efa6 Merge topic 'FindCUDAToolkit-static-deps' into release-3.26
1d6c343661 FindCUDAToolkit: Add missing static library dependencies on pthread and libdl

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8422
2023-04-26 10:22:26 -04:00
Brad King f0b45e6dbb Merge topic 'FindCUDAToolkit_nvrtc_windows_dependencies' into release-3.26
11a9f88bdf FindCUDAToolkit: Fix nvrtc_static dependencies on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8405
2023-04-26 10:21:12 -04:00
Robert Maynard 1d6c343661 FindCUDAToolkit: Add missing static library dependencies on pthread and libdl
Discourse-topic: https://discourse.cmake.org/t/7946
2023-04-26 10:19:59 -04:00
Robert Maynard 11a9f88bdf FindCUDAToolkit: Fix nvrtc_static dependencies on Windows
Required for CUDA toolkit 11.5:

* https://docs.nvidia.com/cuda/archive/11.5.0/nvrtc/index.html#build-instruction
2023-04-25 13:37:19 -04:00
Marc Chevrier 32c3dbbee8 Merge topic 'Help-CMP0105-clarifications' into release-3.26
afd40232fa Help: CMP0105 policy: clarifications

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8418
2023-04-17 05:15:58 -04:00
Marc Chevrier afd40232fa Help: CMP0105 policy: clarifications 2023-04-15 10:11:22 +02:00
Brad King 35c8f504ae Merge topic 'doc-typo' into release-3.26
045fbbb47c Help: Remove duplicated word in COMPILE_OPTIONS target property docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8396
2023-04-06 09:06:43 -04:00
Brad King 038cd7f620 Merge topic 'FindCUDAToolkit-nvptxcompiler_static-deps' into release-3.26
8711231739 FindCUDAToolkit: nvptxcompiler_static correctly specify dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8395
2023-04-06 09:05:49 -04:00
Brad King 22d5d08a3f Merge topic 'FindCUDAToolkit-cusparse-deps' into release-3.26
516d807423 FindCUDAToolkit: Add dependency between cusparse and nvJitLink

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8397
2023-04-06 09:04:41 -04:00
Robert Maynard 516d807423 FindCUDAToolkit: Add dependency between cusparse and nvJitLink
Starting in CUDA 12.0 cusparse uses nvJitLink. As part of verifying this PR I also corrected the nvJitLink dependencies
2023-04-05 11:37:06 -04:00
Robert Maynard 8711231739 FindCUDAToolkit: nvptxcompiler_static correctly specify dependencies
Avoids linking to `Threads::Threads` on non-unix systems where it isn't needed. In addition ensures that dlopen symbols are resolved.
2023-04-05 10:57:55 -04:00
Brad King 045fbbb47c Help: Remove duplicated word in COMPILE_OPTIONS target property docs
Fixes: #24673
2023-04-05 09:44:10 -04:00
Brad King 624461526f CMake 3.26.3 v3.26.3 2023-04-04 14:59:48 -04:00
Brad King 5a3a7abb9f Merge branch 'release-3.25' into release-3.26 2023-04-04 14:25:35 -04:00
Brad King 905b62c3c2 Merge branch 'release-3.24' into release-3.25 2023-04-04 14:24:58 -04:00