summaryrefslogtreecommitdiffstats
path: root/Source/cmake.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-03-10 14:16:23 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-03-10 14:16:23 (GMT)
commit1ed74b9d228a076b2b0ad4476ea9013cf143354e (patch)
tree7cba7f480a54b612265b84dfa181c43801bbb0a4 /Source/cmake.cxx
parent030ec94780b7aaf0c495bfb5d6c7e12071342dfd (diff)
parentb42866a34a742f89a35382d17d58070c73486d92 (diff)
downloadCMake-1ed74b9d228a076b2b0ad4476ea9013cf143354e.zip
CMake-1ed74b9d228a076b2b0ad4476ea9013cf143354e.tar.gz
CMake-1ed74b9d228a076b2b0ad4476ea9013cf143354e.tar.bz2
Merge topic 'remove-vs6-generator'
b42866a3 Drop Visual Studio 6 generator cd9ba3ec cmLocalVisualStudio7Generator: Fix name of helper function
Diffstat (limited to 'Source/cmake.cxx')
-rw-r--r--Source/cmake.cxx4
1 files changed, 0 insertions, 4 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 8f6b952..c197dae 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -51,7 +51,6 @@
// include the generator
#if defined(_WIN32) && !defined(__CYGWIN__)
# if !defined(CMAKE_BOOT_MINGW)
-# include "cmGlobalVisualStudio6Generator.h"
# include "cmGlobalVisualStudio7Generator.h"
# include "cmGlobalVisualStudio71Generator.h"
# include "cmGlobalVisualStudio8Generator.h"
@@ -1429,7 +1428,6 @@ int cmake::ActualConfigure()
const char* GeneratorName;
};
VSRegistryEntryName version[] = {
- {"6.0", "Visual Studio 6"},
{"7.0", "Visual Studio 7"},
{"7.1", "Visual Studio 7 .NET 2003"},
{"8.0", "Visual Studio 8 2005"},
@@ -1839,8 +1837,6 @@ void cmake::AddDefaultGenerators()
this->Generators.push_back(
cmGlobalVisualStudio7Generator::NewFactory());
this->Generators.push_back(
- cmGlobalVisualStudio6Generator::NewFactory());
- this->Generators.push_back(
cmGlobalBorlandMakefileGenerator::NewFactory());
this->Generators.push_back(
cmGlobalNMakeMakefileGenerator::NewFactory());