Merge topic 'ci-clang16-windows'

be1549d950 ci: Enable C++ modules tests with LLVM/Clang 16.0 on Windows
eb93e1ff18 ci: Update LLVM/Clang to 16.0 in nightly CI jobs on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8350

.gitlab-ci.yml

@@ -1104,7 +1104,7 @@ t:windows-borland5.8:
     variables:
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:windows-clang15.0-cl-ninja:
+t:windows-clang16.0-cl-ninja:
     extends:
         - .windows_clang_ninja
         - .cmake_test_windows_external
@@ -1116,10 +1116,10 @@ t:windows-clang15.0-cl-ninja:
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
-        CMAKE_CI_BUILD_NAME: windows_clang15.0_cl_ninja
+        CMAKE_CI_BUILD_NAME: windows_clang16.0_cl_ninja
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:windows-clang15.0-cl-nmake:
+t:windows-clang16.0-cl-nmake:
     extends:
         - .windows_clang_nmake
         - .cmake_test_windows_external
@@ -1131,10 +1131,10 @@ t:windows-clang15.0-cl-nmake:
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
-        CMAKE_CI_BUILD_NAME: windows_clang15.0_cl_nmake
+        CMAKE_CI_BUILD_NAME: windows_clang16.0_cl_nmake
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:windows-clang15.0-gnu-ninja:
+t:windows-clang16.0-gnu-ninja:
     extends:
         - .windows_clang_ninja
         - .cmake_test_windows_external
@@ -1146,10 +1146,10 @@ t:windows-clang15.0-gnu-ninja:
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
-        CMAKE_CI_BUILD_NAME: windows_clang15.0_gnu_ninja
+        CMAKE_CI_BUILD_NAME: windows_clang16.0_gnu_ninja
         CMAKE_CI_JOB_NIGHTLY: "true"
 
-t:windows-clang15.0-gnu-nmake:
+t:windows-clang16.0-gnu-nmake:
     extends:
         - .windows_clang_nmake
         - .cmake_test_windows_external
@@ -1161,7 +1161,7 @@ t:windows-clang15.0-gnu-nmake:
     needs:
         - t:windows-vs2022-x64-ninja
     variables:
-        CMAKE_CI_BUILD_NAME: windows_clang15.0_gnu_nmake
+        CMAKE_CI_BUILD_NAME: windows_clang16.0_gnu_nmake
         CMAKE_CI_JOB_NIGHTLY: "true"
 
 t:mingw_osdn_io-mingw_makefiles:

.gitlab/ci/clang.ps1

@@ -1,10 +1,10 @@
 $erroractionpreference = "stop"
 
-if ("$env:CMAKE_CI_BUILD_NAME".Contains("clang15.0")) {
-    # LLVM/Clang 15.0
-    # https://github.com/llvm/llvm-project/releases/tag/llvmorg-15.0.4
-    $filename = "llvm-15.0.4-win-x86_64-1"
-    $sha256sum = "9AA305084C20C27972E103E7B18AAC3F755E0534542AF62FC2F2BF5DDD3C4E1F"
+if ("$env:CMAKE_CI_BUILD_NAME".Contains("clang16.0")) {
+    # LLVM/Clang 16.0
+    # https://github.com/llvm/llvm-project/releases/tag/llvmorg-16.0.0
+    $filename = "llvm-16.0.0-win-x86_64-1"
+    $sha256sum = "13F48356BA5892A82E8BB25EB283FDDAA8F23A0F209B6BF6525D2C5E1285B950"
 } else {
     throw ('unknown CMAKE_CI_BUILD_NAME: ' + "$env:CMAKE_CI_BUILD_NAME")
 }

.gitlab/ci/configure_windows_clang_ninja.cmake

@@ -1 +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_RULES "${CMAKE_CURRENT_LIST_DIR}/cxx_modules_rules_clang.cmake" CACHE STRING "")
+endif()
 include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_clang_common.cmake")