diff options
| author | Brad King <brad.king@kitware.com> | 2023-11-16 18:11:36 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-11-17 14:58:22 (GMT) |
| commit | a8be80ccf258dc38845d1a934242ecd2d242a400 (patch) | |
| tree | 696a59b8e7b739fcfaf015e0cddbcee9f98dad13 | |
| parent | 99238b23e9683a96edc75ab2a2ec223b35aa2b4e (diff) | |
| download | CMake-a8be80ccf258dc38845d1a934242ecd2d242a400.zip CMake-a8be80ccf258dc38845d1a934242ecd2d242a400.tar.gz CMake-a8be80ccf258dc38845d1a934242ecd2d242a400.tar.bz2 | |
ci: Drop now-unnecessary Clang rules for CXXModules tests
Starting with LLVM/Clang 17 we can use C++ modules with compiler
extensions enabled.
| -rw-r--r-- | .gitlab/ci/configure_fedora39_ninja_clang.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/configure_fedora39_ninja_multi_clang.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/configure_windows_clang_ninja.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/cxx_modules_rules_clang.cmake | 3 |
4 files changed, 0 insertions, 6 deletions
diff --git a/.gitlab/ci/configure_fedora39_ninja_clang.cmake b/.gitlab/ci/configure_fedora39_ninja_clang.cmake index 49552d6..79d3eaa 100644 --- a/.gitlab/ci/configure_fedora39_ninja_clang.cmake +++ b/.gitlab/ci/configure_fedora39_ninja_clang.cmake @@ -1,4 +1,3 @@ set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly" CACHE STRING "") -set(CMake_TEST_MODULE_COMPILATION_RULES "${CMAKE_CURRENT_LIST_DIR}/cxx_modules_rules_clang.cmake" CACHE STRING "") include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common_clang.cmake") diff --git a/.gitlab/ci/configure_fedora39_ninja_multi_clang.cmake b/.gitlab/ci/configure_fedora39_ninja_multi_clang.cmake index 49552d6..79d3eaa 100644 --- a/.gitlab/ci/configure_fedora39_ninja_multi_clang.cmake +++ b/.gitlab/ci/configure_fedora39_ninja_multi_clang.cmake @@ -1,4 +1,3 @@ set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly" CACHE STRING "") -set(CMake_TEST_MODULE_COMPILATION_RULES "${CMAKE_CURRENT_LIST_DIR}/cxx_modules_rules_clang.cmake" CACHE STRING "") include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora39_common_clang.cmake") diff --git a/.gitlab/ci/configure_windows_clang_ninja.cmake b/.gitlab/ci/configure_windows_clang_ninja.cmake index 8a65eef..fcb2d46 100644 --- a/.gitlab/ci/configure_windows_clang_ninja.cmake +++ b/.gitlab/ci/configure_windows_clang_ninja.cmake @@ -1,5 +1,4 @@ if("$ENV{CMAKE_CI_BUILD_NAME}" MATCHES "(^|_)gnu(_|$)") set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly" CACHE STRING "") - set(CMake_TEST_MODULE_COMPILATION_RULES "${CMAKE_CURRENT_LIST_DIR}/cxx_modules_rules_clang.cmake" CACHE STRING "") endif() include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_clang_common.cmake") diff --git a/.gitlab/ci/cxx_modules_rules_clang.cmake b/.gitlab/ci/cxx_modules_rules_clang.cmake deleted file mode 100644 index 1268244..0000000 --- a/.gitlab/ci/cxx_modules_rules_clang.cmake +++ /dev/null @@ -1,3 +0,0 @@ -# Default to C++ extensions being off. Clang's modules support have trouble -# with extensions right now. -set(CMAKE_CXX_EXTENSIONS OFF) |