diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-29 15:50:08 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-11-29 15:51:35 (GMT) |
| commit | 31e013ae6066067433676c21b8698256404d64f1 (patch) | |
| tree | 627bea433b75be3c41f980c4b9b89bedffd7c25d /Source | |
| parent | 2f7e05fbc20150377668a4ea1b114fd1b4d92df6 (diff) | |
| parent | d639620e14cb25a3bc8039bc2a50bf402b8d2f79 (diff) | |
| download | CMake-31e013ae6066067433676c21b8698256404d64f1.zip CMake-31e013ae6066067433676c21b8698256404d64f1.tar.gz CMake-31e013ae6066067433676c21b8698256404d64f1.tar.bz2 | |
Merge branch 'vs15-rename-generator' into vs15-rename-generator-for-master
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalVisualStudio15Generator.cxx | 11 | ||||
| -rw-r--r-- | Source/cmake.cxx | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/Source/cmGlobalVisualStudio15Generator.cxx b/Source/cmGlobalVisualStudio15Generator.cxx index 19b48df..091a03e 100644 --- a/Source/cmGlobalVisualStudio15Generator.cxx +++ b/Source/cmGlobalVisualStudio15Generator.cxx @@ -8,16 +8,19 @@ #include "cmMakefile.h" #include "cmVS141CLFlagTable.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; } @@ -52,7 +55,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 59290ff..733e0e4 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1457,7 +1457,7 @@ void cmake::CreateDefaultGlobalGenerator() const char* GeneratorName; }; static VSVersionedGenerator const vsGenerators[] = { - { "15.0", "Visual Studio 15" }, // + { "15.0", "Visual Studio 15 2017" }, // { "14.0", "Visual Studio 14 2015" }, // { "12.0", "Visual Studio 12 2013" }, // { "11.0", "Visual Studio 11 2012" }, // |