STYLE: name the external generator "KDevelop3 - Unix Makefiles" instead of "Unix Makefiles -

KDevelop3"
-initialize Ignore to 0, crashes otherwise

Alex

3 files changed, 9 insertions, 4 deletions

diff --git a/Source/cmCommandArgumentsHelper.cxx b/Source/cmCommandArgumentsHelper.cxx
index 1552354..3fb5642 100644
--- a/Source/cmCommandArgumentsHelper.cxx
+++ b/Source/cmCommandArgumentsHelper.cxx
@@ -123,6 +123,7 @@ cmCAStringVector::cmCAStringVector(cmCommandArgumentsHelper* args,
                                    const char* key, 
                                    cmCommandArgumentGroup* group)
 :cmCommandArgument(args, key, group)
+,Ignore(0)
 {
   if ((key==0) || (*key==0))
     {
diff --git a/Source/cmExternalMakefileProjectGenerator.cxx b/Source/cmExternalMakefileProjectGenerator.cxx
index e1a8bcf..21a4032 100644
--- a/Source/cmExternalMakefileProjectGenerator.cxx
+++ b/Source/cmExternalMakefileProjectGenerator.cxx
@@ -26,12 +26,12 @@ std::string cmExternalMakefileProjectGenerator::CreateFullGeneratorName(
   std::string fullName;
   if (globalGenerator)
     {
-    fullName = globalGenerator;
     if (extraGenerator && *extraGenerator)
       {
+      fullName = extraGenerator;
       fullName += " - ";
-      fullName += extraGenerator;
       }
+    fullName += globalGenerator;
     }
   return fullName;
 }
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 7bec758..6d7e398 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1422,7 +1422,6 @@ int cmake::ExecuteCMakeCommand(std::vector<std::string>& args)
 void cmake::AddExtraGenerator(const char* name, 
                               CreateExtraGeneratorFunctionType newFunction)
 {
-  this->ExtraGenerators[name] = newFunction;
   cmExternalMakefileProjectGenerator* extraGenerator = newFunction();
   const std::vector<std::string>& supportedGlobalGenerators =
                                 extraGenerator->GetSupportedGlobalGenerators();
@@ -1448,7 +1447,12 @@ void cmake::AddDefaultExtraGenerators()
 #endif
 // e.g. eclipse ?
 #ifdef CMAKE_USE_KDEVELOP
-  this->AddExtraGenerator(cmGlobalKdevelopGenerator::GetActualName(), &cmGlobalKdevelopGenerator::New);
+  this->AddExtraGenerator(cmGlobalKdevelopGenerator::GetActualName(), 
+                          &cmGlobalKdevelopGenerator::New);
+  // for kdevelop also add the generator with just the name of the 
+  // extra generator, since it was this way since cmake 2.2
+  this->ExtraGenerators[cmGlobalKdevelopGenerator::GetActualName()] 
+                                             = &cmGlobalKdevelopGenerator::New;
 #endif
 }