BUG: also offer the extra generators in CMakeSetup

Alex

Source/MFCDialog/CMakeSetupDialog.cpp

@@ -11,6 +11,7 @@
 #include "PathDialog.h"
 #include "CMakeSetupDialog.h"
 #include "CMakeCommandLineInfo.h"
+#include "../cmExternalMakefileProjectGenerator.h"
 #include "../cmListFileCache.h"
 #include "../cmCacheManager.h"
 #include "../cmake.h"
@@ -1010,7 +1011,10 @@ void CMakeSetupDialog::LoadCacheFromDiskToGUI()
     if(!it.IsAtEnd())
       {
       m_GeneratorPicked = true;
-      std::string curGen = it.GetValue();
+      const char* extraGen = cachem->GetCacheValue("CMAKE_EXTRA_GENERATOR");
+      std::string curGen = cmExternalMakefileProjectGenerator::
+                              CreateFullGeneratorName(it.GetValue(), extraGen);
+
       if(m_GeneratorDialog.m_GeneratorChoiceString != curGen.c_str())
         {
         m_GeneratorDialog.m_GeneratorChoiceString = curGen.c_str();

Source/cmExtraCodeBlocksGenerator.cxx

@@ -47,8 +47,9 @@ cmExtraCodeBlocksGenerator::cmExtraCodeBlocksGenerator()
 {
 #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");
 }

Source/cmake.cxx

@@ -1557,6 +1557,12 @@ void cmake::GetRegisteredGenerators(std::vector<std::string>& names)
     {
     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)