summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'doc-SYSTEM'Brad King2022-12-073-7/+7
|\ | | | | | | | | | | | | b15b9cf286 Help: Clarify SYSTEM property default for imported targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7990
| * Help: Clarify SYSTEM property default for imported targetsBrad King2022-12-063-7/+7
| | | | | | | | | | | | The `SYSTEM` directory property does not affect imported targets. Fixes: #24219
* | CMake Nightly Date StampKitware Robot2022-12-071-1/+1
| |
* | Merge branch 'release-3.25'Brad King2022-12-060-0/+0
|\ \
| * \ Merge topic 'ci-os-arch' into release-3.25Brad King2022-12-065-47/+30
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | 2bf1ce6cc3 gitlab-ci: drop unnecessary linux kernel version tag on 3.25 release branch 429574a94e gitlab-ci: replace '$os' tags with '$os-x86_64' on 3.25 release branch Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7995
* | | Merge topic 'ci-os-arch'Brad King2022-12-060-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c922722ec0 Merge branch 'backport-ci-os-arch' into ci-os-arch 2bf1ce6cc3 gitlab-ci: drop unnecessary linux kernel version tag on 3.25 release branch 429574a94e gitlab-ci: replace '$os' tags with '$os-x86_64' on 3.25 release branch Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7995
| * \ \ Merge branch 'backport-ci-os-arch' into ci-os-archBrad King2022-12-060-0/+0
| |\ \ \ |/ / / / | | | _
| * | gitlab-ci: drop unnecessary linux kernel version tag on 3.25 release branchBrad King2022-12-062-33/+16
| | | | | | | | | | | | | | | | | | | | | | | | All our CI hosts now have Linux kernel version 3.17 or higher, so we no longer need a dedicated tag. This backports commit c212c7dc8b (gitlab-ci: drop unnecessary linux kernel version tag, 2022-11-30) to the 3.25 release branch.
| * | gitlab-ci: replace '$os' tags with '$os-x86_64' on 3.25 release branchBrad King2022-12-064-15/+15
| |/ | | | | | | | | | | | | | | | | | | | | The latter tags are now available on our CI runners to more explicitly distinguish `linux-x86_64` from `linux-aarch64` and to distinguish `{macos,windows}-x86_64` from `{macos,windows}-arm64`. This backports commit 33fe37a660 (gitlab-ci: replace '{macos,windows}' tags with '{macos,windows}-x86_64', 2022-11-30) and commit 94d82d91d5 (gitlab-ci: replace 'linux' tags with 'linux-x86_64', 2022-11-30) to the 3.25 release branch.
* | Merge topic 'automoc-case-change'Brad King2022-12-061-0/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | 318ec07560 automoc: Remove existing output file before invoking moc Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7985
| * | automoc: Remove existing output file before invoking mocJason Haslam2022-12-051-0/+3
| | | | | | | | | | | | | | | Remove the output file before invoking moc in case the case of source file has changed on disk. Recent versions of clang warn when the case of the include directive (which does change) doesn't match the case of the file on disk.
* | | Merge topic 'ci-pre-build-post-build'Brad King2022-12-064-1/+41
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7be3c961f ci: build clang-tidy plugin in pre-build step 372ce5bffe ci: add pre-build and post-build steps to Linux Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7989
| * | | ci: build clang-tidy plugin in pre-build stepKyle Edwards2022-12-051-1/+3
| | | | | | | | | | | | | | | | And use sccache and Ninja.
| * | | ci: add pre-build and post-build steps to LinuxKyle Edwards2022-12-053-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pre-build step will allow actions to be executed before the CMake build but after Ninja and sccache have been downloaded, so they can be used in the pre-build step. The env step is meant for setting up environment variables anyway, rather than performing actions. The post-build step will allow extra artifacts to be computed after the build is complete.
* | | | Merge topic 'ci-nvhpc'Brad King2022-12-061-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7d2979d6eb gitlab-ci: Select CUDA version explicitly in NVHPC job Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7987
| * | | | gitlab-ci: Select CUDA version explicitly in NVHPC jobBrad King2022-12-051-0/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The job added by commit 16a5c36795 (gitlab-ci: add nightly job testing NVHPC with Ninja on Linux, 2022-11-21) started failing after CI hosts were updated from NVIDIA driver version 520 to version 525. Somehow this causes the NVHPC multi-cuda `nvcc` wrapper to select CUDA 10.2 instead of 11.7 as with older driver versions. As a workaround, add the preferred version of `nvcc` to the PATH. Issue: #24225
* | | | Merge topic 'FindOpenSSL-static-z'Brad King2022-12-061-4/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1b7804edd0 FindOpenSSL: use extra dependencies from pkg-config as well Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7986
| * | | | FindOpenSSL: use extra dependencies from pkg-config as wellRolf Eike Beer2022-12-051-4/+38
| | | | | | | | | | | | | | | | | | | | This is important if OpenSSL is linked against an external zlib.
* | | | | Merge topic 'cxx-module-map-clang'Brad King2022-12-0616-6/+194
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c558cfd1b gitlab-ci: add CI jobs for Clang with C++20 modules abd42e9cfc ci: add a Docker container for clang support of C++20 modules 51093f3002 Clang-FindBinUtils: also find `clang-scan-deps` 0b333de923 ci: add C++ module rules file for Clang 21b9fb1e8c cmCxxModuleMapper: support the `clang` module map format 9c66224668 cmNinjaTargetGenerator: skip setting `depfile` for `none` scantypes 9123a0991f cmNinjaTargetGenerator: use `.clear()` to empty out some strings Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Cristian Adam <cristian.adam@gmail.com> Merge-request: !7978
| * | | | | gitlab-ci: add CI jobs for Clang with C++20 modulesBen Boeckel2022-12-024-0/+50
| | | | | |
| * | | | | ci: add a Docker container for clang support of C++20 modulesBen Boeckel2022-12-024-0/+66
| | | | | |
| * | | | | Clang-FindBinUtils: also find `clang-scan-deps`Ben Boeckel2022-12-021-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | `clang-scan-deps` will be required for C++20 module scanning purposes.
| * | | | | ci: add C++ module rules file for ClangBen Boeckel2022-12-021-0/+16
| | | | | |
| * | | | | cmCxxModuleMapper: support the `clang` module map formatBen Boeckel2022-12-025-4/+46
| | | | | |
| * | | | | cmNinjaTargetGenerator: skip setting `depfile` for `none` scantypesBen Boeckel2022-12-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `clang` mechanism does not support `depfile` discovered dependencies at the moment.
| * | | | | cmNinjaTargetGenerator: use `.clear()` to empty out some stringsBen Boeckel2022-12-021-2/+2
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2022-12-061-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'ArgumentFlags-function-args'Brad King2022-12-053-6/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 466f9b886d cmTargetPropCommandBase::HandleArguments: flags must be OR'able Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7983
| * | | | | cmTargetPropCommandBase::HandleArguments: flags must be OR'ableCraig Scott2022-12-033-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flags argument is intended to support multiple flags from the ArgumentFlags enum. Therefore, flags cannot be of enum type, it must be an integral type that allows flags to be OR'ed together. Update the one call site that was erroneously OR'ing multiple values but then casting that to an ArgumentFlags, which could result in passing a technically invalid value. Amends: dd3482f6752d (cmTargetPropCommandBase: Restore ArgumentFlags enum value bool logic, 2022-11-27)
* | | | | | Merge topic 'find_library-arch-unknown'Brad King2022-12-051-0/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e7f78309e7 find_library: Construct paths by removing 'unknown' from library arch Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7921
| * | | | | | find_library: Construct paths by removing 'unknown' from library archNemanja Ivanovic2022-12-011-0/+15
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compiler used for a build sometimes disagrees with the remainder of the toolchain wrt. to the architecture triple. Specifically, Clang will typically put its libraries in `<arch>-unknown-<os>-<env>` but it uses the GCC toolchain on many targets (which often has its libraries in `<arch>-<os>-<env>`). In such cases CMake will acquire the triple from Clang and use it in library search paths for libraries that are provided by the GCC toolchain. This of course fails due to the mismatch. This patch augments the list of search paths with ones that include the architecture triple with any occurrences of 'unknown' removed. Fixes: #24175
* | | | | | Merge topic 'link-options-cache'Brad King2022-12-051-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7c63372c22 cmGeneratorTarget: Fix regression in CUDA device link options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7981
| * | | | | | cmGeneratorTarget: Fix regression in CUDA device link optionsBrad King2022-12-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit f69d1872db (cmGeneratorTarget: Add caches to some functions, 2022-11-23) we cache the computed link options for a target. Cache the host and device link options separately.
* | | | | | | Merge topic 'test-file-GET_RUNTIME_DEPENDENCIES-rpath-xl'Brad King2022-12-052-2/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f8fed12250 Tests: Enable RunCMake.file-GET_RUNTIME_DEPENDENCIES linux cases on XL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7980
| * | | | | | | Tests: Enable RunCMake.file-GET_RUNTIME_DEPENDENCIES linux cases on XLBrad King2022-12-022-2/+5
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were excluded with the XL and XLClang compilers because one such compiler in nightly testing hard-codes `--enable-new-dtags`. Add a way to disable the cases via local configuration instead so that we can run them on the rest of the XL compilers.
* | | | | | | Merge branch 'release-3.25'Brad King2022-12-050-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge topic 'CheckSymbolExists-restore-newline' into release-3.25Brad King2022-12-051-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9273b8f421 CheckSymbolExists: Restore newline at end of test source Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Petr Nechaev <petr.nechaev@cogentembedded.com> Merge-request: !7979
* | \ \ \ \ \ \ Merge topic 'CheckSymbolExists-restore-newline'Brad King2022-12-051-1/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9273b8f421 CheckSymbolExists: Restore newline at end of test source Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Petr Nechaev <petr.nechaev@cogentembedded.com> Merge-request: !7979
| * | | | | | | CheckSymbolExists: Restore newline at end of test sourceAndrey Vostrikov2022-12-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit db76876db5 (Modules: Use new SOURCES_FROM_* try_compile (1/2), 2022-09-26, v3.25.0-rc1~74^2~1) accidentally dropped the final newline of the test source, which was previously provided by the input to `configure_file`. The C standard requires a newline at the end of file, so add one explicitly. Signed-off-by: Andrey Vostrikov <andrey.vostrikov@cogentembedded.com>
* | | | | | | | Merge topic 'clang-tidy-module-string-concatenation-fix'Kyle Edwards2022-12-054-42/+62
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b1366e215e clang-tidy module: fix offset issue with last string concat operand Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7984
| * | | | | | | clang-tidy module: fix offset issue with last string concat operandKyle Edwards2022-12-034-42/+62
| | | | | | | |
* | | | | | | | Merge branch 'release-3.25'Craig Scott2022-12-050-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge topic 'FetchContent-SYSTEM' into release-3.25Craig Scott2022-12-051-0/+3
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b85141f83 FetchContent: Don't pass SYSTEM through to sub-build Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7977
* | | | | | | | Merge topic 'FetchContent-SYSTEM'Craig Scott2022-12-051-0/+3
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b85141f83 FetchContent: Don't pass SYSTEM through to sub-build Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7977
| * | | | | | | FetchContent: Don't pass SYSTEM through to sub-buildCraig Scott2022-12-021-0/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we don't filter out SYSTEM from the arguments we pass through to ExternalProject_Add(), it gets appended as a list item to whatever arguments precede it because ExternalProject_Add() doesn't recognize it as a keyword. Fixes: #24201
* | | | | | | CMake Nightly Date StampKitware Robot2022-12-051-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2022-12-041-1/+1
| |/ / / / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2022-12-031-1/+1
| |/ / / |/| | |
* | | | Merge topic 'file-GET_RUNTIME_DEPENDENCIES-transitive-rpath'Brad King2022-12-027-5/+91
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 136622a2b2 file(GET_RUNTIME_DEPENDENCIES): propagate transitive parent's rpath 4aa3149c67 Tests: Simplify RunCMake.file-GET_RUNTIME_DEPENDENCIES case cleaning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7968
| * | | | file(GET_RUNTIME_DEPENDENCIES): propagate transitive parent's rpathAlex Lapenkou2022-12-027-2/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes incorrect runtime dependency resolution when the dependency is located in rpaths of a transitive parent. Instead of supplying only the rpaths of the immediate parent, it combines the rpaths of all transitive parents and passes them down. Fixes: #24172
generated by cgit v0.12 at 2025-02-07 13:39:07 (GMT)