diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-02 20:15:11 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-09-07 19:49:08 (GMT) |
| commit | bdc679a8aee4e6b9a8aea795bdbda2341d1e5d08 (patch) | |
| tree | f9ade938675a59071bd1efe075cc3ff5ec58f7cf /Source/cmake.cxx | |
| parent | a8936656faa14b27173f90046fef6259dceaa321 (diff) | |
| download | CMake-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 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 25f9e3a..d6bea3d 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -66,6 +66,7 @@ #include "cmGlobalVisualStudio11Generator.h" #include "cmGlobalVisualStudio12Generator.h" #include "cmGlobalVisualStudio14Generator.h" +#include "cmGlobalVisualStudio15Generator.h" #include "cmGlobalVisualStudio71Generator.h" #include "cmGlobalVisualStudio8Generator.h" #include "cmGlobalVisualStudio9Generator.h" @@ -1317,6 +1318,7 @@ int cmake::ActualConfigure() { "11.0", "Visual Studio 11 2012" }, { "12.0", "Visual Studio 12 2013" }, { "14.0", "Visual Studio 14 2015" }, + { "15.0", "Visual Studio 15" }, { 0, 0 } }; for (int i = 0; version[i].MSVersion != 0; i++) { @@ -1634,6 +1636,7 @@ void cmake::AddDefaultGenerators() { #if defined(_WIN32) && !defined(__CYGWIN__) #if !defined(CMAKE_BOOT_MINGW) + this->Generators.push_back(cmGlobalVisualStudio15Generator::NewFactory()); this->Generators.push_back(cmGlobalVisualStudio14Generator::NewFactory()); this->Generators.push_back(cmGlobalVisualStudio12Generator::NewFactory()); this->Generators.push_back(cmGlobalVisualStudio11Generator::NewFactory()); |