[cmake-commits] king committed cmGlobalGenerator.cxx 1.177 1.178

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalGenerator.cxx 
Log Message:
BUG: Need to create global targets before AddHelperCommands is called.  We should investigate creating global targets at the beginning of the configure step even if their commands are not populated or if they will not actually be generated later.


Index: cmGlobalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalGenerator.cxx,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -d -r1.177 -r1.178
--- cmGlobalGenerator.cxx	22 May 2007 14:24:59 -0000	1.177
+++ cmGlobalGenerator.cxx	25 May 2007 19:51:33 -0000	1.178
@@ -734,19 +734,6 @@
 {
   // For each existing cmLocalGenerator
   unsigned int i;
- 
-  // Add generator specific helper commands
-  for (i = 0; i < this->LocalGenerators.size(); ++i)
-    {
-    this->LocalGenerators[i]->AddHelperCommands();
-    }
-
-  // Trace the dependencies, after that no custom commands should be added
-  // because their dependencies might not be handled correctly
-  for (i = 0; i < this->LocalGenerators.size(); ++i)
-    {
-    this->LocalGenerators[i]->TraceDependencies();
-    }
 
   // Consolidate global targets
   cmTargets globalTargets;
@@ -775,6 +762,19 @@
       (*targets)[tit->first].SetMakefile(mf);
       }
     }
+ 
+  // Add generator specific helper commands
+  for (i = 0; i < this->LocalGenerators.size(); ++i)
+    {
+    this->LocalGenerators[i]->AddHelperCommands();
+    }
+
+  // Trace the dependencies, after that no custom commands should be added
+  // because their dependencies might not be handled correctly
+  for (i = 0; i < this->LocalGenerators.size(); ++i)
+    {
+    this->LocalGenerators[i]->TraceDependencies();
+    }
 
   // Compute the manifest of main targets generated.
   for (i = 0; i < this->LocalGenerators.size(); ++i)