diff options
| author | Brad King <brad.king@kitware.com> | 2022-02-03 14:57:39 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-02-03 14:57:45 (GMT) |
| commit | 8d4e353ede5d0e890b0df35a061d70dd8de2301c (patch) | |
| tree | f3be984d5a6da368d42293de5a670873caac14e2 | |
| parent | 736663deed91a383d6f60ea0994c3f4de394e7b0 (diff) | |
| parent | 040c509bce24a12cb6d15712e803196dd2431dee (diff) | |
| download | CMake-8d4e353ede5d0e890b0df35a061d70dd8de2301c.zip CMake-8d4e353ede5d0e890b0df35a061d70dd8de2301c.tar.gz CMake-8d4e353ede5d0e890b0df35a061d70dd8de2301c.tar.bz2 | |
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 <kwrobot@kitware.com>
Merge-request: !6947
| -rw-r--r-- | .gitlab/os-windows.yml | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tests/RunCMake/PrecompileHeaders/RunCMakeTest.cmake | 3 | ||||
| -rw-r--r-- | Tests/RunCMake/pseudo_llvm-rc.c | 4 |
4 files changed, 9 insertions, 3 deletions
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index e15bbe9..2bce8c8 100644 --- a/.gitlab/os-windows.yml +++ b/.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: diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index e12ffba..1d7e632 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/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") diff --git a/Tests/RunCMake/PrecompileHeaders/RunCMakeTest.cmake b/Tests/RunCMake/PrecompileHeaders/RunCMakeTest.cmake index ca5b52e..a7b3126 100644 --- a/Tests/RunCMake/PrecompileHeaders/RunCMakeTest.cmake +++ b/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() diff --git a/Tests/RunCMake/pseudo_llvm-rc.c b/Tests/RunCMake/pseudo_llvm-rc.c index 7acb2a3..65f0a9e 100644 --- a/Tests/RunCMake/pseudo_llvm-rc.c +++ b/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> |