From 7ec26a5f42ebe5a4bf385b241f71bdf442695077 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 7 Aug 2025 21:08:11 -0400 Subject: [PATCH] Tests/RunCMake: test `RunCMake_GENERATOR` instead of `CMAKE_GENERATOR` --- Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake | 2 +- Tests/RunCMake/Autogen_1/RunCMakeTest.cmake | 4 ++-- Tests/RunCMake/Autogen_7/RunCMakeTest.cmake | 2 +- Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake | 2 +- Tests/RunCMake/PrecompileHeaders/RunCMakeTest.cmake | 4 ++-- Tests/RunCMake/UnityBuild/RunCMakeTest.cmake | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake b/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake index 91a54a842a..5d9f26c9ff 100644 --- a/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake +++ b/Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake @@ -62,7 +62,7 @@ function (run_cmake_AutoExport name dir) endif() endfunction () run_cmake_AutoExport(AutoExport "say.dir") -if (CMAKE_GENERATOR MATCHES "(Ninja|Makefiles|Visual Studio)") +if (RunCMake_GENERATOR MATCHES "(Ninja|Makefiles|Visual Studio)") run_cmake_AutoExport(AutoExportShort ".o/0cb3d702") endif () diff --git a/Tests/RunCMake/Autogen_1/RunCMakeTest.cmake b/Tests/RunCMake/Autogen_1/RunCMakeTest.cmake index d8151a4973..fbcb0ffc53 100644 --- a/Tests/RunCMake/Autogen_1/RunCMakeTest.cmake +++ b/Tests/RunCMake/Autogen_1/RunCMakeTest.cmake @@ -66,7 +66,7 @@ if (DEFINED with_qt_version) run_cmake_command(AutogenUseSystemIncludeOn-build ${CMAKE_COMMAND} --build . --config Debug --verbose) endblock() - if (CMAKE_GENERATOR MATCHES "(Ninja|Makefiles|Visual Studio)") + if (RunCMake_GENERATOR MATCHES "(Ninja|Makefiles|Visual Studio)") block() set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/CMP0151Short-new-build) run_cmake_with_options(CMP0151Short-new ${RunCMake_TEST_OPTIONS} -DCMAKE_AUTO${autogen_type}=ON -DCMAKE_POLICY_DEFAULT_CMP0151=NEW) @@ -115,7 +115,7 @@ if (DEFINED with_qt_version) run_cmake_command(AutogenUseSystemIncludeOff-build ${CMAKE_COMMAND} --build . --config Debug --verbose) endblock() - if (CMAKE_GENERATOR MATCHES "(Ninja|Makefiles|Visual Studio)") + if (RunCMake_GENERATOR MATCHES "(Ninja|Makefiles|Visual Studio)") block() set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/CMP0151Short-old-build) run_cmake_with_options(CMP0151Short-old ${RunCMake_TEST_OPTIONS} -DCMAKE_AUTO${autogen_type}=ON -DCMAKE_POLICY_DEFAULT_CMP0151=OLD) diff --git a/Tests/RunCMake/Autogen_7/RunCMakeTest.cmake b/Tests/RunCMake/Autogen_7/RunCMakeTest.cmake index 904f4edfb8..a669452249 100644 --- a/Tests/RunCMake/Autogen_7/RunCMakeTest.cmake +++ b/Tests/RunCMake/Autogen_7/RunCMakeTest.cmake @@ -7,7 +7,7 @@ if (DEFINED with_qt_version) "-DCMAKE_PREFIX_PATH:STRING=${CMAKE_PREFIX_PATH}" ) run_cmake(AutoMocIncludeDirectories) - if (CMAKE_GENERATOR MATCHES "(Ninja|Makefiles|Visual Studio)") + if (RunCMake_GENERATOR MATCHES "(Ninja|Makefiles|Visual Studio)") run_cmake(AutoMocIncludeDirectoriesShort) endif () endif() diff --git a/Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake b/Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake index 33aebe973c..ffc8703d5b 100644 --- a/Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake +++ b/Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake @@ -91,6 +91,6 @@ function(run_Dependencies suffix) endfunction() run_Dependencies("") -if (CMAKE_GENERATOR MATCHES "(Ninja|Makefiles|Visual Studio)") +if (RunCMake_GENERATOR MATCHES "(Ninja|Makefiles|Visual Studio)") run_Dependencies(Short) endif () diff --git a/Tests/RunCMake/PrecompileHeaders/RunCMakeTest.cmake b/Tests/RunCMake/PrecompileHeaders/RunCMakeTest.cmake index 60e3ad3e76..35b2fe37f4 100644 --- a/Tests/RunCMake/PrecompileHeaders/RunCMakeTest.cmake +++ b/Tests/RunCMake/PrecompileHeaders/RunCMakeTest.cmake @@ -17,11 +17,11 @@ endfunction() run_cmake(DisabledPch) run_cmake(PchDebugGenex) -if (CMAKE_GENERATOR MATCHES "(Ninja|Makefiles|Visual Studio)") +if (RunCMake_GENERATOR MATCHES "(Ninja|Makefiles|Visual Studio)") run_cmake(PchDebugGenexShort) endif () run_test(PchInterface) -if (CMAKE_GENERATOR MATCHES "(Ninja|Makefiles|Visual Studio)") +if (RunCMake_GENERATOR MATCHES "(Ninja|Makefiles|Visual Studio)") run_test(PchInterfaceShort) endif () run_test(PchInterfaceUnity) diff --git a/Tests/RunCMake/UnityBuild/RunCMakeTest.cmake b/Tests/RunCMake/UnityBuild/RunCMakeTest.cmake index eab5abf214..55bbe98b3d 100644 --- a/Tests/RunCMake/UnityBuild/RunCMakeTest.cmake +++ b/Tests/RunCMake/UnityBuild/RunCMakeTest.cmake @@ -72,6 +72,6 @@ endfunction() run_test(unitybuild_runtest) run_test(unitybuild_object_library) -if (CMAKE_GENERATOR MATCHES "(Ninja|Makefiles|Visual Studio)") +if (RunCMake_GENERATOR MATCHES "(Ninja|Makefiles|Visual Studio)") run_build(unitybuild_cxx_short) endif ()