From 775f012fae7b789301285420d60707c0246977f9 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 25 May 2007 15:51:33 -0400 Subject: 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. --- Source/cmGlobalGenerator.cxx | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 4f2e6f4..06679fd 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -734,19 +734,6 @@ void cmGlobalGenerator::Generate() { // 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 @@ void cmGlobalGenerator::Generate() (*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) -- cgit v0.12