diff options
author | Brad King <brad.king@kitware.com> | 2013-10-28 14:08:11 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2013-10-28 17:43:14 (GMT) |
commit | 29071fed2efbc7857f3994ac746641a4c5a36b9d (patch) | |
tree | 9a03032b070863099f98867b920bbb78d741b7b7 /Source/cmake.cxx | |
parent | 16df2456a440d87fb3e8e53fb59a2817b288b9af (diff) | |
download | CMake-29071fed2efbc7857f3994ac746641a4c5a36b9d.zip CMake-29071fed2efbc7857f3994ac746641a4c5a36b9d.tar.gz CMake-29071fed2efbc7857f3994ac746641a4c5a36b9d.tar.bz2 |
VS: Add version year to generator names
Rename the Visual Studio >= 10 generators to indicate the version year:
Visual Studio 10 => Visual Studio 10 2010
Visual Studio 11 => Visual Studio 11 2012
Visual Studio 12 => Visual Stduio 12 2013
Report the names with the year to the list of available generators so
that the cmake-gui drop-down shows the years. When selecting a
generator from the "-G" option or from an existing CMAKE_GENERATOR cache
entry, recognize names without the years for compatibility and map them
to the names with years.
Update the generator names in the cmake-generators.7 manual.
Diffstat (limited to 'Source/cmake.cxx')
-rw-r--r-- | Source/cmake.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 186d4e6..f786691 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1468,9 +1468,9 @@ int cmake::ActualConfigure() {"7.1", "Visual Studio 7 .NET 2003"}, {"8.0", "Visual Studio 8 2005"}, {"9.0", "Visual Studio 9 2008"}, - {"10.0", "Visual Studio 10"}, - {"11.0", "Visual Studio 11"}, - {"12.0", "Visual Studio 12"}, + {"10.0", "Visual Studio 10 2010"}, + {"11.0", "Visual Studio 11 2012"}, + {"12.0", "Visual Studio 12 2013"}, {0, 0}}; for(int i=0; version[i].MSVersion != 0; i++) { @@ -1509,7 +1509,7 @@ int cmake::ActualConfigure() const char* genName = this->CacheManager->GetCacheValue("CMAKE_GENERATOR"); if(genName) { - if(strcmp(this->GlobalGenerator->GetName(), genName) != 0) + if(!this->GlobalGenerator->MatchesGeneratorName(genName)) { std::string message = "Error: generator : "; message += this->GlobalGenerator->GetName(); |