[cmake-commits] alex committed cmCommandArgumentsHelper.cxx 1.2 1.3 cmExternalMakefileProjectGenerator.cxx 1.1 1.2 cmake.cxx 1.305 1.306

[cmake-commits at cmake.org]

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

Modified Files:
	cmCommandArgumentsHelper.cxx 
	cmExternalMakefileProjectGenerator.cxx cmake.cxx 
Log Message:

STYLE: name the external generator "KDevelop3 - Unix Makefiles" instead of "Unix Makefiles -
KDevelop3"
-initialize Ignore to 0, crashes otherwise

Alex


Index: cmExternalMakefileProjectGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmExternalMakefileProjectGenerator.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- cmExternalMakefileProjectGenerator.cxx	8 Jun 2007 15:57:16 -0000	1.1
+++ cmExternalMakefileProjectGenerator.cxx	3 Jul 2007 20:10:50 -0000	1.2
@@ -26,12 +26,12 @@
   std::string fullName;
   if (globalGenerator)
     {
-    fullName = globalGenerator;
     if (extraGenerator && *extraGenerator)
       {
+      fullName = extraGenerator;
       fullName += " - ";
-      fullName += extraGenerator;
       }
+    fullName += globalGenerator;
     }
   return fullName;
 }

Index: cmCommandArgumentsHelper.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCommandArgumentsHelper.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- cmCommandArgumentsHelper.cxx	2 Jul 2007 20:46:18 -0000	1.2
+++ cmCommandArgumentsHelper.cxx	3 Jul 2007 20:10:50 -0000	1.3
@@ -123,6 +123,7 @@
                                    const char* key, 
                                    cmCommandArgumentGroup* group)
 :cmCommandArgument(args, key, group)
+,Ignore(0)
 {
   if ((key==0) || (*key==0))
     {

Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -d -r1.305 -r1.306
--- cmake.cxx	27 Jun 2007 16:07:34 -0000	1.305
+++ cmake.cxx	3 Jul 2007 20:10:50 -0000	1.306
@@ -1422,7 +1422,6 @@
 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 @@
 #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
 }