[cmake-commits] alex committed cmGlobalGenerator.cxx 1.185 1.186 cmGlobalGenerator.h 1.81 1.82 cmMakefile.h 1.207 1.208 cmake.cxx 1.298 1.299

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalGenerator.cxx cmGlobalGenerator.h cmMakefile.h 
	cmake.cxx 
Log Message:

STYLE: minor fixes

Alex


Index: cmGlobalGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalGenerator.h,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- cmGlobalGenerator.h	15 Jun 2007 14:10:24 -0000	1.81
+++ cmGlobalGenerator.h	15 Jun 2007 20:07:16 -0000	1.82
@@ -19,13 +19,13 @@
 #define cmGlobalGenerator_h
 
 #include "cmStandardIncludes.h"
-#include "cmExternalMakefileProjectGenerator.h"
 
 #include "cmTarget.h" // For cmTargets
 
 class cmake;
 class cmMakefile;
 class cmLocalGenerator;
+class cmExternalMakefileProjectGenerator;
 class cmTarget;
 
 /** \class cmGlobalGenerator
@@ -126,8 +126,7 @@
   void SetExternalMakefileProjectGenerator(
                            cmExternalMakefileProjectGenerator *extraGenerator);
 
-  const char* GetExtraGeneratorName() const
-          {return this->ExtraGenerator!=0 ? this->ExtraGenerator->GetName():0;}
+  const char* GetExtraGeneratorName() const;
 
   void AddInstallComponent(const char* component);
   void EnableInstallTarget();

Index: cmGlobalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalGenerator.cxx,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -d -r1.185 -r1.186
--- cmGlobalGenerator.cxx	12 Jun 2007 12:23:24 -0000	1.185
+++ cmGlobalGenerator.cxx	15 Jun 2007 20:07:16 -0000	1.186
@@ -1670,3 +1670,7 @@
     }
 }
 
+const char* cmGlobalGenerator::GetExtraGeneratorName() const
+{
+  return this->ExtraGenerator==0 ? 0 : this->ExtraGenerator->GetName();
+}

Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -d -r1.298 -r1.299
--- cmake.cxx	15 Jun 2007 14:10:24 -0000	1.298
+++ cmake.cxx	15 Jun 2007 20:07:16 -0000	1.299
@@ -1817,7 +1817,7 @@
     // We must have a bad generator selection.  Wipe the cache entry so the
     // user can select another.
     this->CacheManager->RemoveCacheEntry("CMAKE_GENERATOR");
-    this->CacheManager->RemoveCacheEntry("CMAKE_EMP_GENERATOR");
+    this->CacheManager->RemoveCacheEntry("CMAKE_EXTRA_GENERATOR");
     }
   // only save the cache if there were no fatal errors
   if ( !this->ScriptMode )

Index: cmMakefile.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.h,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -d -r1.207 -r1.208
--- cmMakefile.h	15 Jun 2007 14:10:24 -0000	1.207
+++ cmMakefile.h	15 Jun 2007 20:07:16 -0000	1.208
@@ -721,10 +721,10 @@
   
   ///! Set/Get the preorder flag
   void SetPreOrder(bool p) { this->PreOrder = p; }
-  bool GetPreOrder() { return this->PreOrder; }
+  bool GetPreOrder() const { return this->PreOrder; }
 
   void AddInstallGenerator(cmInstallGenerator* g)
-    { this->InstallGenerators.push_back(g); }
+    { if(g) this->InstallGenerators.push_back(g); }
   std::vector<cmInstallGenerator*>& GetInstallGenerators()
     { return this->InstallGenerators; }