summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-03-06 13:59:12 +0000
committerKitware Robot <kwrobot@kitware.com>2023-03-06 08:59:21 -0500
commit617b8df7cf6da8b73247c2622cde32c9733aa7c8 (patch)
tree80fee466f4b4b781030045505030f414d56839b6 /.gitlab
parent0bb5f2be2201b9a0224176ce542f88ec73014b58 (diff)
parent3fe8e33f278312c7840672ebae4b1e99c69e59bf (diff)
downloadcmake-617b8df7cf6da8b73247c2622cde32c9733aa7c8.tar.gz
Merge topic 'clang-16-cxx-modules'
3fe8e33f27 Clang: Record Clang 16.0 flags for our experimental C++ modules support Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: scivision <michael@scivision.dev> Acked-by: Alex <leha-bot@yandex.ru> Merge-request: !8285
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/cxx_modules_rules_clang.cmake11
1 files changed, 0 insertions, 11 deletions
diff --git a/.gitlab/ci/cxx_modules_rules_clang.cmake b/.gitlab/ci/cxx_modules_rules_clang.cmake
index fcb22817be..8088330c94 100644
--- a/.gitlab/ci/cxx_modules_rules_clang.cmake
+++ b/.gitlab/ci/cxx_modules_rules_clang.cmake
@@ -1,17 +1,6 @@
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"
- " --"
- " <CMAKE_CXX_COMPILER> <DEFINES> <INCLUDES> <FLAGS>"
- " -x c++ <SOURCE> -c -o <OBJECT>"
- " -MT <DYNDEP_FILE>"
- " -MD -MF <DEP_FILE>"
- " > <DYNDEP_FILE>")
-set(CMAKE_EXPERIMENTAL_CXX_MODULE_MAP_FORMAT "clang")
-set(CMAKE_EXPERIMENTAL_CXX_MODULE_MAP_FLAG "@<MODULE_MAP_FILE>")
# Default to C++ extensions being off. Clang's modules support have trouble
# with extensions right now.