summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-11-29 16:05:29 (GMT)
committerBrad King <brad.king@kitware.com>2016-11-29 16:05:29 (GMT)
commitf75d936a04d159f0ec278fce3ff8f95bc74da775 (patch)
tree9155145544cca5034ba03f20e6751d403979811d /Source
parenta04bbcde3d0fe3f550fab5611d4a06dc323b095e (diff)
parentd639620e14cb25a3bc8039bc2a50bf402b8d2f79 (diff)
downloadCMake-f75d936a04d159f0ec278fce3ff8f95bc74da775.zip
CMake-f75d936a04d159f0ec278fce3ff8f95bc74da775.tar.gz
CMake-f75d936a04d159f0ec278fce3ff8f95bc74da775.tar.bz2
Merge branch 'vs15-rename-generator' into release
Diffstat (limited to 'Source')
-rw-r--r--Source/cmGlobalVisualStudio15Generator.cxx11
-rw-r--r--Source/cmake.cxx2
2 files changed, 8 insertions, 5 deletions
diff --git a/Source/cmGlobalVisualStudio15Generator.cxx b/Source/cmGlobalVisualStudio15Generator.cxx
index a833a5f..0c6beb2 100644
--- a/Source/cmGlobalVisualStudio15Generator.cxx
+++ b/Source/cmGlobalVisualStudio15Generator.cxx
@@ -6,16 +6,19 @@
#include "cmLocalVisualStudio10Generator.h"
#include "cmMakefile.h"
-static const char vs15generatorName[] = "Visual Studio 15";
+static const char vs15generatorName[] = "Visual Studio 15 2017";
// Map generator name without year to name with year.
static const char* cmVS15GenName(const std::string& name, std::string& genName)
{
if (strncmp(name.c_str(), vs15generatorName,
- sizeof(vs15generatorName) - 1) != 0) {
+ sizeof(vs15generatorName) - 6) != 0) {
return 0;
}
- const char* p = name.c_str() + sizeof(vs15generatorName) - 1;
+ const char* p = name.c_str() + sizeof(vs15generatorName) - 6;
+ if (cmHasLiteralPrefix(p, " 2017")) {
+ p += 5;
+ }
genName = std::string(vs15generatorName) + p;
return p;
}
@@ -50,7 +53,7 @@ public:
virtual void GetDocumentation(cmDocumentationEntry& entry) const
{
entry.Name = std::string(vs15generatorName) + " [arch]";
- entry.Brief = "Generates Visual Studio 15 project files. "
+ entry.Brief = "Generates Visual Studio 2017 project files. "
"Optional [arch] can be \"Win64\" or \"ARM\".";
}
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index c8cf465..f0caf0d 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1334,7 +1334,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" },
+ { "15.0", "Visual Studio 15 2017" },
{ 0, 0 }
};
for (int i = 0; version[i].MSVersion != 0; i++) {