summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.26.5v3.26.5Brad King2023-07-192-3/+3
|
* Merge branch 'armclang-update-version-computation' into release-3.26Brad King2023-07-181-1/+1
|\ | | | | | | Merge-request: !8636
| * ARMClang: Fix computation of compiler semantic version patch levelDaniel Brondani2023-07-181-1/+1
|/ | | | | | 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.
* Merge branch 'doc-project-none' into release-3.26Brad King2023-06-232-4/+3
|\ | | | | | | Merge-request: !8585
| * Help: Restore project command docs for default languages and NONEBrad King2023-06-222-4/+3
| | | | | | | | | | | | | | | | 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
* | Merge branch 'backport-3.26-sphinx-domain-parallel' into release-3.26Brad King2023-06-231-0/+13
|\ \ | |/ |/| | | Merge-request: !8575
| * Utilities/Sphinx: Fix parallel documentation builds for 3.26Jared Dillard2023-06-211-0/+13
|/ | | | | | | | | 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
* Merge topic 'werror_space_fix' into release-3.26Brad King2023-05-311-1/+1
|\ | | | | | | | | | | | | | | 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
| * CMakeDetermineCompilerABI: Avoid removing the flag after -WerrorRaul Tambre2023-05-301-1/+1
|/ | | | | | | | | | | 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: 079ea66468a6ffe0b02c3d6622bc0230fdf455b0 See-also: https://discourse.cmake.org/t/8230
* Merge topic 'backport-sphinx-file-encoding' into release-3.26Brad King2023-05-303-9/+10
|\ | | | | | | | | | | | | | | | | 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
| * Tests: Always load presets schema as UTF-8Craig Scott2023-05-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | 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
| * Sphinx: Modernize UTF-8 encoding handling when updating CMake.qhpCraig Scott2023-05-301-4/+4
| |
| * Sphinx: Specify encoding when opening files for title extractionCraig Scott2023-05-301-2/+3
|/ | | | | | | | | | 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
* CMake 3.26.4v3.26.4Brad King2023-05-182-3/+3
|
* Merge topic 'FindPython-fix-launcher-typo' into release-3.26Brad King2023-05-181-1/+1
|\ | | | | | | | | | | | | 31faf3945f FindPython: fix interpreter launcher variable spelling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8487
| * FindPython: fix interpreter launcher variable spellingBen Boeckel2023-05-171-1/+1
| | | | | | | | Reported-by: Johannes (#cmake Slack)
* | Merge topic 'msvc-wine-showIncludes' into release-3.26Brad King2023-05-166-1/+17
|\ \ | | | | | | | | | | | | | | | | | | | | | 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
| * | Ninja: Restore detection of msvc-wine showIncludes prefixBrad King2023-05-156-1/+17
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge topic 'FindCUDAToolkit_more_library_root_detection' into release-3.26Brad King2023-05-052-22/+70
|\ \ | | | | | | | | | | | | | | | | | | 587c0443cc FindCUDAToolkit: Support CUDA version extraction from version.json Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8451
| * | FindCUDAToolkit: Support CUDA version extraction from version.jsonRobert Maynard2023-05-042-22/+70
|/ / | | | | | | Fixes: #24858
* | Merge topic 'findjni_new_ubuntu_versions' into release-3.26Brad King2023-05-021-0/+7
|\ \ | | | | | | | | | | | | | | | | | | 7f738313e0 FindJNI: add Ubuntu specific paths for more recent JDK versions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8449
| * | FindJNI: add Ubuntu specific paths for more recent JDK versionsEven Rouault2023-05-011-0/+7
| | |
* | | Merge topic 'FindCUDAToolkit-static-deps' into release-3.26Brad King2023-04-261-1/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1d6c343661 FindCUDAToolkit: Add missing static library dependencies on pthread and libdl Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8422
| * | | FindCUDAToolkit: Add missing static library dependencies on pthread and libdlRobert Maynard2023-04-261-1/+5
| | | | | | | | | | | | | | | | Discourse-topic: https://discourse.cmake.org/t/7946
* | | | Merge topic 'FindCUDAToolkit_nvrtc_windows_dependencies' into release-3.26Brad King2023-04-261-1/+6
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 11a9f88bdf FindCUDAToolkit: Fix nvrtc_static dependencies on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8405
| * | | FindCUDAToolkit: Fix nvrtc_static dependencies on WindowsRobert Maynard2023-04-251-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Required for CUDA toolkit 11.5: * https://docs.nvidia.com/cuda/archive/11.5.0/nvrtc/index.html#build-instruction
* | | | Merge topic 'Help-CMP0105-clarifications' into release-3.26Marc Chevrier2023-04-171-2/+3
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | afd40232fa Help: CMP0105 policy: clarifications Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8418
| * | | Help: CMP0105 policy: clarificationsMarc Chevrier2023-04-151-2/+3
|/ / /
* | | Merge topic 'doc-typo' into release-3.26Brad King2023-04-061-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 045fbbb47c Help: Remove duplicated word in COMPILE_OPTIONS target property docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8396
| * | | Help: Remove duplicated word in COMPILE_OPTIONS target property docsBrad King2023-04-051-1/+1
| | |/ | |/| | | | | | | Fixes: #24673
* | | Merge topic 'FindCUDAToolkit-nvptxcompiler_static-deps' into release-3.26Brad King2023-04-061-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8711231739 FindCUDAToolkit: nvptxcompiler_static correctly specify dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8395
| * | | FindCUDAToolkit: nvptxcompiler_static correctly specify dependenciesRobert Maynard2023-04-051-1/+1
| |/ / | | | | | | | | | Avoids linking to `Threads::Threads` on non-unix systems where it isn't needed. In addition ensures that dlopen symbols are resolved.
* | | Merge topic 'FindCUDAToolkit-cusparse-deps' into release-3.26Brad King2023-04-061-6/+9
|\ \ \ | |/ / |/| | | | | | | | | | | | | | 516d807423 FindCUDAToolkit: Add dependency between cusparse and nvJitLink Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8397
| * | FindCUDAToolkit: Add dependency between cusparse and nvJitLinkRobert Maynard2023-04-051-6/+9
|/ / | | | | | | Starting in CUDA 12.0 cusparse uses nvJitLink. As part of verifying this PR I also corrected the nvJitLink dependencies
* | CMake 3.26.3v3.26.3Brad King2023-04-042-3/+3
| |
* | Merge branch 'release-3.25' into release-3.26Brad King2023-04-040-0/+0
|\ \
| * \ Merge branch 'release-3.24' into release-3.25Brad King2023-04-040-0/+0
| |\ \
| | * \ Merge branch 'release-3.23' into release-3.24Brad King2023-04-040-0/+0
| | |\ \
| | | * \ Merge branch 'test-xcode-14.3' into release-3.23Brad King2023-04-041-0/+1
| | | |\ \ | | | | | | | | | | | | | | | | | | Merge-request: !8392
| | * | \ \ Merge branch 'test-xcode-14.3' into release-3.24Brad King2023-04-041-0/+1
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | Merge-request: !8392
| * | | | | Merge branch 'test-xcode-14.3' into release-3.25Brad King2023-04-041-0/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | Merge-request: !8392
* | | | | | Merge topic 'test-xcode-14.3' into release-3.26Brad King2023-04-041-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | 3bb46b29fd Tests: Teach RunCMake to ignore Xcode DVTCoreDeviceEnabledState warnings Merge-request: !8392
| * | | | | Tests: Teach RunCMake to ignore Xcode DVTCoreDeviceEnabledState warningsBrad King2023-04-041-0/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge branch 'release-3.25' into release-3.26Brad King2023-04-040-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'release-3.24' into release-3.25Brad King2023-04-040-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'release-3.23' into release-3.24Brad King2023-04-040-0/+0
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'swift-xcode-14.3' into release-3.23Brad King2023-04-031-4/+8
| | | |\ \ | | | | | | | | | | | | | | | | | | Merge-request: !8388
| | * | \ \ Merge branch 'swift-xcode-14.3' into release-3.24Brad King2023-04-031-4/+8
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | Merge-request: !8388
| * | | | | Merge branch 'swift-xcode-14.3' into release-3.25Brad King2023-04-031-4/+8
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | Merge-request: !8388
* | | | | | Merge topic 'swift-xcode-14.3' into release-3.26Brad King2023-04-041-4/+8
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | 52dbfefe0d Xcode: Fix detection of Swift compiler location for Xcode 14.3 Merge-request: !8388
generated by cgit v0.12 at 2024-09-02 20:25:37 (GMT)