summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-05-30 14:18:50 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-05-30 14:19:21 (GMT)
commit958191a95c9d06c0efa9240d0e98ada429e9bc3f (patch)
tree329c70681bd6591e964ef0bbcb1380d8ad8c2126 /Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake
parentfdb9d1ba042fb517da0bf03a3781dd7a3b506f69 (diff)
parent5f1316841944198037d6463d3ddd12efcfae45b3 (diff)
downloadCMake-958191a95c9d06c0efa9240d0e98ada429e9bc3f.zip
CMake-958191a95c9d06c0efa9240d0e98ada429e9bc3f.tar.gz
CMake-958191a95c9d06c0efa9240d0e98ada429e9bc3f.tar.bz2
Merge topic 'vs-toolset-version'
5f13168419 VS: Add option to select the version of the toolset used by VS 2017 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Francisco Facioni <fran6co@gmail.com> Merge-request: !2093
Diffstat (limited to 'Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake')
-rw-r--r--Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake12
1 files changed, 12 insertions, 0 deletions
diff --git a/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake b/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake
index f89100e..d1738a0 100644
--- a/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake
+++ b/Tests/RunCMake/GeneratorToolset/RunCMakeTest.cmake
@@ -25,6 +25,18 @@ if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 1[01245]")
run_cmake(BadToolsetHostArch)
set(RunCMake_GENERATOR_TOOLSET "Test Toolset,host=x64,host=x64")
run_cmake(BadToolsetHostArchTwice)
+ if("${RunCMake_GENERATOR}" MATCHES "Visual Studio 15")
+ set(RunCMake_GENERATOR_TOOLSET "Test Toolset,version=Test Toolset Version")
+ run_cmake(TestToolsetVersionBoth)
+ set(RunCMake_GENERATOR_TOOLSET ",version=Test Toolset Version")
+ run_cmake(TestToolsetVersionOnly)
+ set(RunCMake_GENERATOR_TOOLSET "version=Test Toolset Version")
+ run_cmake(TestToolsetVersionOnly)
+ set(RunCMake_GENERATOR_TOOLSET "Test Toolset,version=Bad Toolset Version")
+ run_cmake(BadToolsetVersion)
+ set(RunCMake_GENERATOR_TOOLSET "Test Toolset,version=Test Toolset Version,version=Test Toolset Version")
+ run_cmake(BadToolsetVersionTwice)
+ endif()
else()
set(RunCMake_GENERATOR_TOOLSET "Test Toolset,host=x64")
run_cmake(BadToolsetHostArch)