mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 21:59:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tests/RunCMake: test RunCMake_GENERATOR instead of CMAKE_GENERATOR

Browse Source
This commit is contained in:
Ben Boeckel
2025-08-07 21:08:11 -04:00
parent 92cab8edae
commit 7ec26a5f42
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/RunCMake/AutoExportDll/RunCMakeTest.cmake
View File

@@ -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 ()

4
Tests/RunCMake/Autogen_1/RunCMakeTest.cmake
View File

@@ -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)

2
Tests/RunCMake/Autogen_7/RunCMakeTest.cmake
View File

@@ -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()

2
Tests/RunCMake/ObjectLibrary/RunCMakeTest.cmake
View File

@@ -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 ()

4
Tests/RunCMake/PrecompileHeaders/RunCMakeTest.cmake
View File

@@ -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)

2
Tests/RunCMake/UnityBuild/RunCMakeTest.cmake
View File

@@ -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 ()