cmGlobalGenerator: Do more computation at compute time.

This commit is contained in:
Stephen Kelly 2015-08-29 09:21:32 +02:00
parent 2eca055988
commit 9eea0486bf
1 changed files with 8 additions and 8 deletions

View File

@ -1284,13 +1284,6 @@ bool cmGlobalGenerator::Compute()
this->AddExtraIDETargets(); this->AddExtraIDETargets();
return true;
}
void cmGlobalGenerator::Generate()
{
unsigned int i;
// Trace the dependencies, after that no custom commands should be added // Trace the dependencies, after that no custom commands should be added
// because their dependencies might not be handled correctly // because their dependencies might not be handled correctly
for (i = 0; i < this->LocalGenerators.size(); ++i) for (i = 0; i < this->LocalGenerators.size(); ++i)
@ -1309,9 +1302,16 @@ void cmGlobalGenerator::Generate()
// Compute the inter-target dependencies. // Compute the inter-target dependencies.
if(!this->ComputeTargetDepends()) if(!this->ComputeTargetDepends())
{ {
return; return false;
} }
return true;
}
void cmGlobalGenerator::Generate()
{
unsigned int i;
// Create a map from local generator to the complete set of targets // Create a map from local generator to the complete set of targets
// it builds by default. // it builds by default.
this->InitializeProgressMarks(); this->InitializeProgressMarks();