summaryrefslogtreecommitdiffstats
path: root/.gitlab
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-05-18 12:44:23 (GMT)
committerBrad King <brad.king@kitware.com>2023-05-18 12:44:23 (GMT)
commitd38779df2a03b984901bc310ec7c370d35a09731 (patch)
tree60e8743887827b947d279993a26775217514b944 /.gitlab
parent69e452524129552e4891feb7949c4af1567a525f (diff)
downloadCMake-d38779df2a03b984901bc310ec7c370d35a09731.zip
CMake-d38779df2a03b984901bc310ec7c370d35a09731.tar.gz
CMake-d38779df2a03b984901bc310ec7c370d35a09731.tar.bz2
ci: Enable RunCMake.CXXModules collation cases in clang jobs
Since commit 069a32b03c (Tests/RunCMake/CXXModules: split out collation-requiring tests, 2022-11-28, v3.26.0-rc1~243^2~4) these cases require explicit configuration.
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/configure_linux_clang_cxx_modules_ninja.cmake2
-rw-r--r--.gitlab/ci/configure_linux_clang_cxx_modules_ninja_multi.cmake2
-rw-r--r--.gitlab/ci/configure_windows_clang_ninja.cmake2
3 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab/ci/configure_linux_clang_cxx_modules_ninja.cmake b/.gitlab/ci/configure_linux_clang_cxx_modules_ninja.cmake
index 43bccdb..671c625 100644
--- a/.gitlab/ci/configure_linux_clang_cxx_modules_ninja.cmake
+++ b/.gitlab/ci/configure_linux_clang_cxx_modules_ninja.cmake
@@ -1,4 +1,4 @@
-set(CMake_TEST_MODULE_COMPILATION "named,partitions,internal_partitions,export_bmi,install_bmi,shared" CACHE STRING "")
+set(CMake_TEST_MODULE_COMPILATION "named,collation,partitions,internal_partitions,export_bmi,install_bmi,shared" 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_external_test.cmake")
diff --git a/.gitlab/ci/configure_linux_clang_cxx_modules_ninja_multi.cmake b/.gitlab/ci/configure_linux_clang_cxx_modules_ninja_multi.cmake
index 43bccdb..671c625 100644
--- a/.gitlab/ci/configure_linux_clang_cxx_modules_ninja_multi.cmake
+++ b/.gitlab/ci/configure_linux_clang_cxx_modules_ninja_multi.cmake
@@ -1,4 +1,4 @@
-set(CMake_TEST_MODULE_COMPILATION "named,partitions,internal_partitions,export_bmi,install_bmi,shared" CACHE STRING "")
+set(CMake_TEST_MODULE_COMPILATION "named,collation,partitions,internal_partitions,export_bmi,install_bmi,shared" 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_external_test.cmake")
diff --git a/.gitlab/ci/configure_windows_clang_ninja.cmake b/.gitlab/ci/configure_windows_clang_ninja.cmake
index a66e302..f864dde 100644
--- a/.gitlab/ci/configure_windows_clang_ninja.cmake
+++ b/.gitlab/ci/configure_windows_clang_ninja.cmake
@@ -1,5 +1,5 @@
if("$ENV{CMAKE_CI_BUILD_NAME}" MATCHES "(^|_)gnu(_|$)")
- set(CMake_TEST_MODULE_COMPILATION "named,partitions,internal_partitions,export_bmi,install_bmi,shared" CACHE STRING "")
+ set(CMake_TEST_MODULE_COMPILATION "named,collation,partitions,internal_partitions,export_bmi,install_bmi,shared" 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")