diff options
| author | Brad King <brad.king@kitware.com> | 2022-12-17 13:47:24 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-12-17 08:47:31 -0500 |
| commit | 02599da236fd22db0dcfb6503194e5bad086aea9 (patch) | |
| tree | 7c336a71ffa32178314bf8091b213978329733ea /.gitlab | |
| parent | 696c3ed3d3b517625b852cd0f6ce5789791a4526 (diff) | |
| parent | 5dc17d0a7a7e7975e426f09210d9433c0c84f753 (diff) | |
| download | cmake-02599da236fd22db0dcfb6503194e5bad086aea9.tar.gz | |
Merge topic 'cxxmodules-clang-update'
5dc17d0a7a gitlab-ci: update to new Clang CI image for C++ modules
e84fcbcb0b cxxmodules: support new round of Clang patches
5e35913382 ci: update `llvm` snapshot to newest patch revisions
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8019
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/cxx_modules_rules_clang.cmake | 7 | ||||
| -rwxr-xr-x | .gitlab/ci/docker/clang_cxx_modules/install_llvm.sh | 2 | ||||
| -rw-r--r-- | .gitlab/os-linux.yml | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/.gitlab/ci/cxx_modules_rules_clang.cmake b/.gitlab/ci/cxx_modules_rules_clang.cmake index 9d75880c68..4b80aabebc 100644 --- a/.gitlab/ci/cxx_modules_rules_clang.cmake +++ b/.gitlab/ci/cxx_modules_rules_clang.cmake @@ -3,11 +3,12 @@ set(CMake_TEST_CXXModules_UUID "a246741c-d067-4019-a8fb-3d16b0c9d1d3") set(CMAKE_EXPERIMENTAL_CXX_MODULE_DYNDEP 1) string(CONCAT CMAKE_EXPERIMENTAL_CXX_SCANDEP_SOURCE "${CMAKE_CXX_COMPILER_CLANG_SCAN_DEPS}" - " -format=p1689 --p1689-targeted-file-name=<SOURCE> --p1689-targeted-output=<OBJECT> --" + " -format=p1689 --p1689-targeted-file-name=<SOURCE> --p1689-targeted-output=<OBJECT> " + " --p1689-makeformat-output=<DEP_FILE>" + " --" " <DEFINES> <INCLUDES> <FLAGS> -x c++ <SOURCE>" + " -MT <DYNDEP_FILE> -MD" " > <DYNDEP_FILE>") -# No support for `-MF` discovered dependencies in `clang-scan-deps`. -set(CMAKE_EXPERIMENTAL_CXX_SCANDEP_DEPFILE_FORMAT "none") set(CMAKE_EXPERIMENTAL_CXX_MODULE_MAP_FORMAT "clang") set(CMAKE_EXPERIMENTAL_CXX_MODULE_MAP_FLAG "@<MODULE_MAP_FILE>") diff --git a/.gitlab/ci/docker/clang_cxx_modules/install_llvm.sh b/.gitlab/ci/docker/clang_cxx_modules/install_llvm.sh index 09d01061ff..025f8a22d8 100755 --- a/.gitlab/ci/docker/clang_cxx_modules/install_llvm.sh +++ b/.gitlab/ci/docker/clang_cxx_modules/install_llvm.sh @@ -2,7 +2,7 @@ set -e -readonly revision="p1689r5-cmake-ci-20221201" # ae3b5489585b60a2b7f090ebb9e1e8729b811253 +readonly revision="p1689r5-cmake-ci-20221215" # a0acf2c9285e848b65ec7336e185888163949490 readonly tarball="https://github.com/mathstuf/llvm-project/archive/$revision.tar.gz" readonly workdir="$HOME/llvm" diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 0b8aad97df..db344f633b 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -377,7 +377,7 @@ CMAKE_GENERATOR: "Ninja Multi-Config" .clang_cxx_modules_x86_64: - image: "kitware/cmake:ci-clang_cxx_modules-x86_64-2022-12-02" + image: "kitware/cmake:ci-clang_cxx_modules-x86_64-2022-12-15" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci" |