diff options
Diffstat (limited to 'Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake')
| -rw-r--r-- | Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake b/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake index b86c481..80d1d5e 100644 --- a/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake +++ b/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake @@ -1,6 +1,6 @@ include(RunCMake) -if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[0124567]") +if("${RunCMake_GENERATOR}" MATCHES "Visual Studio") run_cmake(VsNormal) include("${RunCMake_BINARY_DIR}/VsNormal-build/defaults.cmake" OPTIONAL) message(STATUS "VsNormal: platform='${VsNormal_Platform}' toolset='${VsNormal_Toolset}'") @@ -9,7 +9,7 @@ endif() set(RunCMake_GENERATOR_TOOLSET "") run_cmake(NoToolset) -if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[0124567]") +if("${RunCMake_GENERATOR}" MATCHES "Visual Studio") set(RunCMake_GENERATOR_TOOLSET "Test Toolset") run_cmake(TestToolset) set(RunCMake_GENERATOR_TOOLSET "Test Toolset,cuda=0.0") @@ -49,7 +49,7 @@ if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[0124567]") run_cmake(TestToolsetFortranIFX) set(RunCMake_GENERATOR_TOOLSET "fortran=bad") run_cmake(BadToolsetFortran) - if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[24567]") + if("${RunCMake_GENERATOR}" MATCHES "Visual Studio") set(RunCMake_GENERATOR_TOOLSET "Test Toolset,host=x64") run_cmake(TestToolsetHostArchBoth) set(RunCMake_GENERATOR_TOOLSET ",host=x64") @@ -119,7 +119,7 @@ set(RunCMake_TEST_OPTIONS -T "Test Toolset" -T "Extra Toolset") run_cmake(TwoToolsets) unset(RunCMake_TEST_OPTIONS) -if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[0124567]|Xcode") +if("${RunCMake_GENERATOR}" MATCHES "Visual Studio|Xcode") set(RunCMake_TEST_OPTIONS -DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/TestToolset-toolchain.cmake) run_cmake(TestToolsetToolchain) unset(RunCMake_TEST_OPTIONS) |