[cmake-commits] alex committed cmExtraCodeBlocksGenerator.cxx 1.3 1.4 cmake.cxx 1.315 1.316

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv26412

Modified Files:
	cmExtraCodeBlocksGenerator.cxx cmake.cxx 
Log Message:
BUG: also offer the extra generators in CMakeSetup

Alex


Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -d -r1.315 -r1.316
--- cmake.cxx	1 Aug 2007 13:18:50 -0000	1.315
+++ cmake.cxx	1 Aug 2007 18:58:55 -0000	1.316
@@ -1557,6 +1557,12 @@
     {
     names.push_back(i->first);
     }
+  for(RegisteredExtraGeneratorsMap::const_iterator 
+      i = this->ExtraGenerators.begin();
+      i != this->ExtraGenerators.end(); ++i)
+    {
+    names.push_back(i->first);
+    }
 }
 
 cmGlobalGenerator* cmake::CreateGlobalGenerator(const char* name)

Index: cmExtraCodeBlocksGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmExtraCodeBlocksGenerator.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- cmExtraCodeBlocksGenerator.cxx	20 Jul 2007 12:36:16 -0000	1.3
+++ cmExtraCodeBlocksGenerator.cxx	1 Aug 2007 18:58:55 -0000	1.4
@@ -47,8 +47,9 @@
 {
 #if defined(_WIN32)
   this->SupportedGlobalGenerators.push_back("NMake Makefiles");
-  this->SupportedGlobalGenerators.push_back("MSYS Makefiles");
   this->SupportedGlobalGenerators.push_back("MinGW Makefiles");
+// disable MSYS until somebody actually tests it
+//  this->SupportedGlobalGenerators.push_back("MSYS Makefiles");
 #endif
   this->SupportedGlobalGenerators.push_back("Unix Makefiles");
 }