mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-12 10:10:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tests: Avoid running VS 16+ tests when using a pre-v140 toolset

Browse Source
This commit is contained in:
Brad King
2024-05-13 10:55:09 -04:00
parent b56c083a54
commit 71a4f052ed
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Tests/RunCMake/CMakeLists.txt
View File

@@ -748,7 +748,8 @@ if("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
endif() endif()
endif() endif()
if(CMAKE_GENERATOR MATCHES "^Visual Studio (1[6-9]|[2-9][0-9])") if(CMAKE_GENERATOR MATCHES "^Visual Studio (1[6-9]|[2-9][0-9])"
AND NOT CMAKE_GENERATOR_TOOLSET MATCHES "^(v80|v90|v100|v110|v120)$")
add_RunCMake_test(VsDotnetSdk) add_RunCMake_test(VsDotnetSdk)
add_RunCMake_test(VsNugetPackageRestore) add_RunCMake_test(VsNugetPackageRestore)
endif() endif()

3
Tests/RunCMake/include_external_msproject/RunCMakeTest.cmake
View File

@@ -11,7 +11,8 @@ if(RunCMake_GENERATOR MATCHES "Visual Studio")
run_cmake(VSCSharpReference) run_cmake(VSCSharpReference)
endif() endif()
if(RunCMake_GENERATOR MATCHES "^Visual Studio (1[6-9]|[2-9][0-9])") if(RunCMake_GENERATOR MATCHES "^Visual Studio (1[6-9]|[2-9][0-9])"
AND NOT RunCMake_GENERATOR_TOOLSET MATCHES "^(v80|v90|v100|v110|v120)$")
function(run_VSCSharpOnlyProject) function(run_VSCSharpOnlyProject)
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/VSCSharpOnlyProject-build) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/VSCSharpOnlyProject-build)
run_cmake(VSCSharpOnlyProject) run_cmake(VSCSharpOnlyProject)