mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 14:20:06 -06:00
Code Issues Packages Projects Releases Wiki Activity
61,008 Commits 2 Branches 385 Tags
65fac2fa35530e9328986966d7c5b286188b9e79
Commit Graph

61008 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Brad King
dc6ef0d9f2 Merge branch 'release-3.23' into release-3.24 2023-04-04 14:24:50 -04:00
Brad King
87812bbcd9 Merge topic 'test-xcode-14.3' into release-3.26 
3bb46b29fd Tests: Teach RunCMake to ignore Xcode DVTCoreDeviceEnabledState warnings

Merge-request: !8392
 2023-04-04 13:04:05 -04:00
Brad King
9b828e045a Merge branch 'test-xcode-14.3' into release-3.25 
Merge-request: !8392
 2023-04-04 13:03:49 -04:00
Brad King
d27cff7ec4 Merge branch 'test-xcode-14.3' into release-3.24 
Merge-request: !8392
 2023-04-04 13:03:41 -04:00
Brad King
21f6ada301 Merge branch 'test-xcode-14.3' into release-3.23 
Merge-request: !8392
 2023-04-04 13:03:10 -04:00
Brad King
3bb46b29fd Tests: Teach RunCMake to ignore Xcode DVTCoreDeviceEnabledState warnings 
On some Xcode versions, `xcodebuild` may warn:

    ... xcodebuild[...] DVTCoreDeviceEnabledState: DVTCoreDeviceEnabledState_Disabled set via user default

Teach RunCMake to drop such incidental lines before matching against
expected output.
 2023-04-04 13:00:07 -04:00
Brad King
fca7e77bff Merge branch 'release-3.25' into release-3.26 2023-04-04 09:27:00 -04:00
Brad King
1dae4d9355 Merge branch 'release-3.24' into release-3.25 2023-04-04 09:26:46 -04:00
Brad King
741abe2540 Merge branch 'release-3.23' into release-3.24 2023-04-04 09:26:32 -04:00
Brad King
f8deb84120 Merge topic 'swift-xcode-14.3' into release-3.26 
52dbfefe0d Xcode: Fix detection of Swift compiler location for Xcode 14.3

Merge-request: !8388
 2023-04-04 09:24:57 -04:00
Brad King
636df83380 Merge branch 'swift-xcode-14.3' into release-3.25 
Merge-request: !8388
 2023-04-03 19:03:37 -04:00
Brad King
5db0c6cffc Merge branch 'swift-xcode-14.3' into release-3.24 
Merge-request: !8388
 2023-04-03 19:03:24 -04:00
Brad King
3b7809b769 Merge branch 'swift-xcode-14.3' into release-3.23 
Merge-request: !8388
 2023-04-03 19:02:56 -04:00
Brad King
52dbfefe0d Xcode: Fix detection of Swift compiler location for Xcode 14.3 
Previously we tried to match output from `xcodebuild` to detect the
path to the `swiftc` tool.  This approach is used for C and CXX
for historical reasons, but is unnecessary for Swift.  We know the
name of the tool, so we can just ask `xcrun --find swiftc`.

Fixes: #24666
 2023-04-03 18:59:57 -04:00
Brad King
b5e972f629 Merge branch 'release-3.25' into release-3.26 2023-04-03 08:57:50 -04:00