summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake/GeneratorPlatform
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-09-02 20:15:11 (GMT)
committerBrad King <brad.king@kitware.com>2016-09-07 19:49:08 (GMT)
commitbdc679a8aee4e6b9a8aea795bdbda2341d1e5d08 (patch)
treef9ade938675a59071bd1efe075cc3ff5ec58f7cf /Tests/RunCMake/GeneratorPlatform
parenta8936656faa14b27173f90046fef6259dceaa321 (diff)
downloadCMake-bdc679a8aee4e6b9a8aea795bdbda2341d1e5d08.zip
CMake-bdc679a8aee4e6b9a8aea795bdbda2341d1e5d08.tar.gz
CMake-bdc679a8aee4e6b9a8aea795bdbda2341d1e5d08.tar.bz2
VS15: Add Visual Studio 15 generator
Call the generator "Visual Studio 15" without any year because the preview version of VS 15 does not provide a year in the product name. Copy cmGlobalVisualStudio14Generator to cmGlobalVisualStudio15Generator and update version numbers accordingly. Add the VS15 enumeration value. Note that we do not need to add a MSVC15 variable or v150 toolset because Visual Studio 15 comes with an updated version of the v140 toolset and remains ABI-compatible. Teach tests VSExternalInclude, RunCMake.GeneratorPlatform, and RunCMake.GeneratorToolset to treat VS 15 as they do VS 10-14. Closes: #16143
Diffstat (limited to 'Tests/RunCMake/GeneratorPlatform')
-rw-r--r--Tests/RunCMake/GeneratorPlatform/RunCMakeTest.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/RunCMake/GeneratorPlatform/RunCMakeTest.cmake b/Tests/RunCMake/GeneratorPlatform/RunCMakeTest.cmake
index 4d0a0a1..27250cb 100644
--- a/Tests/RunCMake/GeneratorPlatform/RunCMakeTest.cmake
+++ b/Tests/RunCMake/GeneratorPlatform/RunCMakeTest.cmake
@@ -3,7 +3,7 @@ include(RunCMake)
set(RunCMake_GENERATOR_PLATFORM "")
run_cmake(NoPlatform)
-if("${RunCMake_GENERATOR}" MATCHES "^Visual Studio ([89]|1[0124])( 20[0-9][0-9])?$")
+if("${RunCMake_GENERATOR}" MATCHES "^Visual Studio ([89]|1[01245])( 20[0-9][0-9])?$")
set(RunCMake_GENERATOR_PLATFORM "x64")
run_cmake(x64Platform)
else()
@@ -17,7 +17,7 @@ set(RunCMake_TEST_OPTIONS -A "Extra Platform")
run_cmake(TwoPlatforms)
unset(RunCMake_TEST_OPTIONS)
-if("${RunCMake_GENERATOR}" MATCHES "^Visual Studio ([89]|1[0124])( 20[0-9][0-9])?$")
+if("${RunCMake_GENERATOR}" MATCHES "^Visual Studio ([89]|1[01245])( 20[0-9][0-9])?$")
set(RunCMake_TEST_OPTIONS -DCMAKE_TOOLCHAIN_FILE=${RunCMake_SOURCE_DIR}/TestPlatform-toolchain.cmake)
run_cmake(TestPlatformToolchain)
unset(RunCMake_TEST_OPTIONS)