From c26b064b8c5f7cd10a15a7d8b0c354a1be7bb738 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 2 Feb 2022 14:45:39 -0500 Subject: Tests: Suppress MSVC CRT deprecation warnings in pseudo_llvm-rc --- Tests/RunCMake/pseudo_llvm-rc.c | 4 ++++ 1 file changed, 4 insertions(+) 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 #include -- cgit v0.12 From bd14f07ce969d12c636af043dc1edbaf06596dc2 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 2 Feb 2022 15:01:47 -0500 Subject: Tests: Skip Clang PCH_INSTANTIATE_TEMPLATES test in MSVC ABI --- Tests/RunCMake/CMakeLists.txt | 1 + Tests/RunCMake/PrecompileHeaders/RunCMakeTest.cmake | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) 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() -- cgit v0.12 From 040c509bce24a12cb6d15712e803196dd2431dee Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 2 Feb 2022 16:27:02 -0500 Subject: gitlab-ci: clarify name of windows fragment for building with ninja --- .gitlab/os-windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 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: -- cgit v0.12