summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge topic 'FindCUDAToolkit-implicit-dirs'Brad King2023-09-297-23/+170
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4316d4dcfd FindCUDAToolkit: Search all of `nvcc` implicit includes and library dirs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8835
| * | | | | FindCUDAToolkit: Search all of `nvcc` implicit includes and library dirsRobert Maynard2023-09-277-23/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves the handling of CUDA layouts where we have multiple include and library directories listed in the output of `nvcc -v`. This updates both when the CUDA language is enabled or not. Fixes: #24915
* | | | | | Merge topic 'help-arbitrary'Brad King2023-09-295-12/+101
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4e50320978 Help: Allow help for arbitrary keywords Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8674
| * | | | | | Help: Allow help for arbitrary keywordsMartin Duffy2023-09-275-12/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes `cmake --help [arg]` to search `Help/*/` instead of `Help/command/` Allows editors to easily display manual for `<cword>`
* | | | | | | Merge topic 'ci-linkcheck'Brad King2023-09-291-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3f684b123d Utilities/Sphinx: Allow linkcheck redirect for our get-involved page Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8848
| * | | | | | | Utilities/Sphinx: Allow linkcheck redirect for our get-involved pageBrad King2023-09-281-0/+1
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `cmake.org/get-involved` URL is more semantically meaningful than the `cmake.org/documentation` URL to which the former now redirects as an implementation detail.
* | | | | | | CMake Nightly Date StampKitware Robot2023-09-291-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'release-3.27'Brad King2023-09-280-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge topic 'android-clang-c++23' into release-3.27Brad King2023-09-281-1/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 75e9918a66 Android: Require Clang 18 for -std=c++23 Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !8847
* | \ \ \ \ \ Merge topic 'android-clang-c++23'Brad King2023-09-281-1/+8
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 75e9918a66 Android: Require Clang 18 for -std=c++23 Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !8847
| * | | | | | Android: Require Clang 18 for -std=c++23Brad King2023-09-271-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the Clang version checks added by * commit eacacc70fc (Clang: use -std=c++23 for Clang 17.0+, 2023-05-08, v3.27.0-rc1~115^2) * commit 0183956d30 (Clang: C++26 support, 2023-05-16, v3.27.0-rc1~85^2) to account for Android NDK r26's distribution of a Clang based on a development version of LLVM/Clang 17.0 that pre-dated addition of these flags. Follow the pattern from commit 12e6796b62 (Android: Do not pass non-existent Clang -std flags, 2018-04-02, v3.12.0-rc1~284^2), which fixed the same problem for `-std=c++17`. Fixes: #25281
* | | | | | | Merge topic 'vs-flags-arch'Brad King2023-09-284-4/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0031d5effa VS: Add `/arch:NotSet` flag table entries for v14x toolsets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8843
| * | | | | | | VS: Add `/arch:NotSet` flag table entries for v14x toolsetsStewart L. McCready2023-09-274-4/+4
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `/arch:NotSet` to set `EnableEnhancedInstructionSet` to `NotSet`. Discourse-topic: https://discourse.cmake.org/t/8892
* | | | | | | CMake Nightly Date StampKitware Robot2023-09-281-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge topic 'cxxmodules-export-dirs-with-prefix'Brad King2023-09-2770-87/+395
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 42654cc818 Tests/CXXModules: add tests for modules with include requirements 7217cb78cf Tests/CXXModules: relax line number matching in stderr b3d1bbbbcc cmExportFileGenerator: relocate include directories for C++ modules 349ff8b080 cmGeneratorTarget: remove not-INTERFACE assertion 681a763425 cmGeneratorTarget: use a character literal Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8838
| * | | | | | Tests/CXXModules: add tests for modules with include requirementsBen Boeckel2023-09-2623-0/+292
| | | | | | |
| * | | | | | Tests/CXXModules: relax line number matching in stderrBen Boeckel2023-09-2645-77/+77
| | | | | | |
| * | | | | | cmExportFileGenerator: relocate include directories for C++ modulesBen Boeckel2023-09-261-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include directories are paths that need munged on install to support the installation prefix. Fixes: #25275
| * | | | | | cmGeneratorTarget: remove not-INTERFACE assertionBen Boeckel2023-09-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IMPORTED INTERFACE targets which provide C++ modules may have include directories that need checked for whether they are system directories or not. These directories are intended for the module compilation themselves (which may include headers that module consumers do not need).
| * | | | | | cmGeneratorTarget: use a character literalBen Boeckel2023-09-261-1/+1
| | | | | | |
* | | | | | | Merge topic 'misc-cxxmodule-fixes'Brad King2023-09-2714-70/+127
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b632f32fa Tests/CXXModules: forward the default build type 5ab6b09691 Tests/CXXModules: fix multi-config and MSVC details 11b62ef118 Tests/CXXModules: add missing `bmi-only` and compiler id fields 5d9631fbdd Tests/CXXModules: fix key set mismatch error messages 86e7fb72cb Tests/CXXModules: use a less generic name for the config 6b940dc590 Tests/CXXModules: replace the object extension as well 1c9f83c8ec Tests/CXXModules: fix error detection propagation 7a4c02cb38 cmGlobalGenerator: factor out messaging for CMP0037 ... Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Acked-by: Pavel Solodovnikov <hellyeahdominate@gmail.com> Merge-request: !8834
| * | | | | | | Tests/CXXModules: forward the default build typeBen Boeckel2023-09-264-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows defaults the build type to `Debug` while other platforms have an empty string.
| * | | | | | | Tests/CXXModules: fix multi-config and MSVC detailsBen Boeckel2023-09-256-25/+25
| | | | | | | |
| * | | | | | | Tests/CXXModules: add missing `bmi-only` and compiler id fieldsBen Boeckel2023-09-256-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missed because the test script did not properly bubble up error reports.
| * | | | | | | Tests/CXXModules: fix key set mismatch error messagesBen Boeckel2023-09-251-2/+2
| | | | | | | |
| * | | | | | | Tests/CXXModules: use a less generic name for the configBen Boeckel2023-09-254-18/+18
| | | | | | | |
| * | | | | | | Tests/CXXModules: replace the object extension as wellBen Boeckel2023-09-252-0/+2
| | | | | | | |
| * | | | | | | Tests/CXXModules: fix error detection propagationBen Boeckel2023-09-254-2/+15
| | | | | | | |
| * | | | | | | cmGlobalGenerator: factor out messaging for CMP0037Ben Boeckel2023-09-251-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also make some strings into character literals.
| * | | | | | | cmGlobalGenerator: use static string views for reserved targetsBen Boeckel2023-09-251-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also make the array static.
| * | | | | | | Help/CMAKE_EXPORT_COMPILE_COMMANDS: mention the `output` fieldBen Boeckel2023-09-251-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added in 887a8874c3 (EXPORT_COMPILE_COMMANDS: add `output` field, 2022-10-28) via !7844. Sync the docs with this addition.
| * | | | | | | cmGeneratorTarget: use `GetSupportDirectory` in PCH codepathsBen Boeckel2023-09-251-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of recalculating the support directory path, use the intended method.
* | | | | | | | Merge topic 'autogen-timestamp-per-config'Brad King2023-09-279-78/+215
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bac468ddfd AutoGen: Fix regression in timestamps on multi-config generators c3f0825d3c Tests/RunCMake/Autogen: Factor out test setup 9654835b4f Tests/RunCMake/Autogen: Add expect_n_times() function Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8840
| * | | | | | | | AutoGen: Fix regression in timestamps on multi-config generatorsOrkun Tokdemir2023-09-263-45/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit fddd0f0443 (Autogen: AUTO*_EXECUTABLE: add support for per-config values, 2023-06-14) we do not correctly generate outputs for one configuration after another configuration has been built. Fix this: - Revert some config based stuff for `Xcode` due to the `$<CONFIG>` genex usage limitation in source files with `Xcode`. - For multi-config generators use a per-config `timestamp_$<CONFIG>` file instead of one `timestamp` file. Fixes: #25261
| * | | | | | | | Tests/RunCMake/Autogen: Factor out test setupOrkun Tokdemir2023-09-266-33/+39
| | | | | | | | |
| * | | | | | | | Tests/RunCMake/Autogen: Add expect_n_times() functionOrkun Tokdemir2023-09-261-0/+10
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge topic 'ci-xcode-15.0'Brad King2023-09-277-55/+85
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f8e0722e75 gitlab-ci: update macOS jobs to use Xcode 15.0 9ba1883ea6 Tests: Fix RunCMake.XcFramework in symlinked paths with Xcode 15 84a1e529ee Tests: Fix failures on macOS arm64 due to Xcode 15 skipping ad-hoc signature cc5d6134ad Tests: Disable visionOS cases because Xcode 15.0 excludes support f9f5751d18 Tests: Clarify RunCMake.XcFramework conditions testing Xcode version e0765c2c46 Tests: Teach RunCMake to ignore Xcode DVTAssertions warnings Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8830
| * | | | | | | | gitlab-ci: update macOS jobs to use Xcode 15.0Brad King2023-09-261-6/+6
| | | | | | | | |
| * | | | | | | | Tests: Fix RunCMake.XcFramework in symlinked paths with Xcode 15Brad King2023-09-261-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `xcodebuild -create-xcframework` tool in Xcode 15.0 fails to compute relative paths if the input paths have symlinks.
| * | | | | | | | Tests: Fix failures on macOS arm64 due to Xcode 15 skipping ad-hoc signatureBrad King2023-09-262-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update commit 1c15eb39d2 (Tests: Suppress failures on macOS arm64 due to separate Xcode signing phase, 2021-02-22, v3.20.0-rc2~11^2) for Xcode 15, which ignores our `-Xlinker -adhoc_codesign` flag, prioritizes its own `-Xlinker -no_adhoc_codesign` flag, and does not add an ad-hoc signature at link time. Issue: #21845
| * | | | | | | | Tests: Disable visionOS cases because Xcode 15.0 excludes supportBrad King2023-09-262-37/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 25977e177b (apple: add preliminary visionOS support, 2023-06-22) we added visionOS based on a Xcode 15 beta version, but the Xcode 15.0 final release did not include it. Disable the test cases until we can improve the condition to detect availability. Issue: #25266
| * | | | | | | | Tests: Clarify RunCMake.XcFramework conditions testing Xcode versionBrad King2023-09-262-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 7050ac56a1 (macOS: Add support for linking against .xcframework folders, 2023-05-17) used conditions based on the AppleClang compiler version, but we actually want to check the Xcode version.
| * | | | | | | | Tests: Teach RunCMake to ignore Xcode DVTAssertions warningsBrad King2023-09-261-0/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some Xcode versions, `xcodebuild` may warn: ... xcodebuild[...] DVTAssertions: Warning ... Teach RunCMake to drop such incidental lines before matching against expected output.
* | | | | | | | CMake Nightly Date StampKitware Robot2023-09-271-1/+1
|/ / / / / / /
* | | | | | | Merge topic 'cuda_handle_target_objects_in_device_link'Brad King2023-09-267-22/+112
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd984261e1 CUDA: Device linking now uses TARGET_OBJECTS content aa8facefe8 CUDA: Visual Studio propagate objects to device linking Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8829
| * | | | | | | CUDA: Device linking now uses TARGET_OBJECTS contentRobert Maynard2023-09-256-8/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to an oversight in cmLinkLineDeviceComputer object files did not get propagate to the device linking phase when given via the `$<TARGET_OBJECTS>` generator expression.
| * | | | | | | CUDA: Visual Studio propagate objects to device linkingRobert Maynard2023-09-221-14/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When given objects via `target_link_libraries(consumer PRIVATE producer)` the VisualStudio solution adds the objects under as `<Object>` entries in the solution. This works for host side linking but isn't handled by the cuda msbuild extensions. So to work around this we manually add the objects as additional link items.
* | | | | | | | Merge topic 'hip-nvidia'Brad King2023-09-2616-100/+233
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fd982eec10 HIP: Add tests for special NVIDIA values of CMAKE_HIP_ARCHITECTURES 8c8b3f1bfa HIP: Fix support for -DCMAKE_HIP_ARCHITECTURES=native with NVCC b3e92775ab HIP: Add CMAKE_HIP_HOST_COMPILER when compiler is NVCC e43918b4ca HIP: Fix linking mixed-lang binary with CXX compiler and Makefile generators 4794505122 HIP: Do not require hip-lang package for NVIDIA platform 09d759dc7f HIP: Simplify exclusion of AMD device runtime with NVIDIA GPUs 2a60663670 HIP: Simplify CMAKE_GENERATOR references for determining compiler 8124950f6c CUDA: Generalize CMAKE_{CUDA => <LANG>}_HOST_COMPILER variable docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8836
| * | | | | | | | HIP: Add tests for special NVIDIA values of CMAKE_HIP_ARCHITECTURESBrad King2023-09-253-0/+72
| | | | | | | | |
| * | | | | | | | HIP: Fix support for -DCMAKE_HIP_ARCHITECTURES=native with NVCCBrad King2023-09-251-4/+4
| | | | | | | | |