From 54dcd459ff5c5ef68fb1ac982bc556dcafa69278 Mon Sep 17 00:00:00 2001 From: Vito Gamberini Date: Wed, 30 Sep 2026 13:26:28 -0400 Subject: [PATCH] ci: Test Windows Clang modules without a developer environment --- .gitlab/ci/configure_windows_clang_cxx_modules_common.cmake | 1 + .gitlab/ci/configure_windows_clang_ninja.cmake | 2 +- .gitlab/ci/configure_windows_clang_ninja_novs.cmake | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 .gitlab/ci/configure_windows_clang_cxx_modules_common.cmake diff --git a/.gitlab/ci/configure_windows_clang_cxx_modules_common.cmake b/.gitlab/ci/configure_windows_clang_cxx_modules_common.cmake new file mode 100644 index 0000000000..65e9d4b858 --- /dev/null +++ b/.gitlab/ci/configure_windows_clang_cxx_modules_common.cmake @@ -0,0 +1 @@ +set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly,build_database,import_std23" CACHE STRING "") diff --git a/.gitlab/ci/configure_windows_clang_ninja.cmake b/.gitlab/ci/configure_windows_clang_ninja.cmake index 5c87bac892..a8ef4850ab 100644 --- a/.gitlab/ci/configure_windows_clang_ninja.cmake +++ b/.gitlab/ci/configure_windows_clang_ninja.cmake @@ -1,7 +1,7 @@ -set(CMake_TEST_MODULE_COMPILATION "named,compile_commands,collation,partitions,internal_partitions,export_bmi,install_bmi,shared,bmionly,build_database,import_std23" CACHE STRING "") if("$ENV{CMAKE_CI_BUILD_NAME}" MATCHES "(^|_)cl(_|$)") set(CMAKE_Fortran_COMPILER "flang" CACHE STRING "") set(CMAKE_Fortran_COMPILER_ID "LLVMFlang" CACHE STRING "") set(CMAKE_Fortran_COMPILER_SUPPORTS_F90 "1" CACHE BOOL "") endif() +include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_clang_cxx_modules_common.cmake") include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_clang_common.cmake") diff --git a/.gitlab/ci/configure_windows_clang_ninja_novs.cmake b/.gitlab/ci/configure_windows_clang_ninja_novs.cmake index 1d9b6b9b6a..564f96ffc3 100644 --- a/.gitlab/ci/configure_windows_clang_ninja_novs.cmake +++ b/.gitlab/ci/configure_windows_clang_ninja_novs.cmake @@ -5,4 +5,5 @@ set(CMake_TEST_FindOpenMP "OFF" CACHE BOOL "") set(CMake_TEST_ASM_MASM "OFF" CACHE BOOL "") set(CMake_TEST_ASM_MARMASM "OFF" CACHE BOOL "") +include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_clang_cxx_modules_common.cmake") include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_clang_common.cmake")