Merge topic 'ci-minor-cleanups' into release-3.23

040c509bce gitlab-ci: clarify name of windows fragment for building with ninja
bd14f07ce9 Tests: Skip Clang PCH_INSTANTIATE_TEMPLATES test in MSVC ABI
c26b064b8c Tests: Suppress MSVC CRT deprecation warnings in pseudo_llvm-rc

Acked-by: Kitware Robot <[email protected]>
Merge-request: !6947

.gitlab/os-windows.yml

@@ -21,7 +21,7 @@
         # could run at the same time, so we drop it.
         GIT_CLONE_PATH: "$CI_BUILDS_DIR\\cmake ci"
 
-.windows_ninja:
+.windows_build_ninja:
     extends: .windows_build
 
     variables:
@@ -39,7 +39,7 @@
 
 .windows_vs2022_x64_ninja:
     extends:
-        - .windows_ninja
+        - .windows_build_ninja
         - .windows_vcvarsall_vs2022_x64
 
     variables:

Tests/RunCMake/CMakeLists.txt

@@ -913,6 +913,7 @@ endif()
 add_RunCMake_test("CTestCommandExpandLists")
 
 add_RunCMake_test(PrecompileHeaders -DCMAKE_C_COMPILER_ID=${CMAKE_C_COMPILER_ID}
+  -DCMAKE_C_SIMULATE_ID=${CMAKE_C_SIMULATE_ID}
   -DCMAKE_C_COMPILER_VERSION=${CMAKE_C_COMPILER_VERSION})
 
 add_RunCMake_test("UnityBuild")

Tests/RunCMake/PrecompileHeaders/RunCMakeTest.cmake

@@ -23,7 +23,8 @@ if(RunCMake_GENERATOR MATCHES "Make|Ninja")
   run_cmake(PchWarnInvalid)
 
   if(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND
-     CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 11.0.0)
+      CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 11.0.0 AND
+      NOT CMAKE_C_SIMULATE_ID STREQUAL "MSVC")
     run_cmake(PchInstantiateTemplates)
   endif()
 endif()

Tests/RunCMake/pseudo_llvm-rc.c

@@ -1,3 +1,7 @@
+#ifndef _CRT_SECURE_NO_WARNINGS
+#  define _CRT_SECURE_NO_WARNINGS
+#endif
+
 #include <stdio.h>
 #include <string.h>