summaryrefslogtreecommitdiffstats
path: root/Tests/VSExternalInclude
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/VSExternalInclude
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/VSExternalInclude')
-rw-r--r--Tests/VSExternalInclude/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/VSExternalInclude/CMakeLists.txt b/Tests/VSExternalInclude/CMakeLists.txt
index 20301c2..7465243 100644
--- a/Tests/VSExternalInclude/CMakeLists.txt
+++ b/Tests/VSExternalInclude/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required (VERSION 2.6)
project(VSExternalInclude)
-if(${CMAKE_GENERATOR} MATCHES "Visual Studio 1[0124]")
+if(${CMAKE_GENERATOR} MATCHES "Visual Studio 1[01245]")
set(PROJECT_EXT vcxproj)
else()
set(PROJECT_EXT vcproj)
@@ -55,7 +55,7 @@ add_dependencies(VSExternalInclude lib2)
# and the sln file can no longer be the only source
# of that depend. So, for VS 10 make the executable
# depend on lib1 and lib2
-if(${CMAKE_GENERATOR} MATCHES "Visual Studio 1[0124]")
+if(${CMAKE_GENERATOR} MATCHES "Visual Studio 1[01245]")
add_dependencies(VSExternalInclude lib1)
endif()