From 9eea0486bfe5dfd497e6a8fca9e3c2551169c24e Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sat, 29 Aug 2015 09:21:32 +0200 Subject: [PATCH] cmGlobalGenerator: Do more computation at compute time. --- Source/cmGlobalGenerator.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 27f860e04..cae546639 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1284,13 +1284,6 @@ bool cmGlobalGenerator::Compute() this->AddExtraIDETargets(); - return true; -} - -void cmGlobalGenerator::Generate() -{ - unsigned int i; - // 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) @@ -1309,9 +1302,16 @@ void cmGlobalGenerator::Generate() // Compute the inter-target dependencies. 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 // it builds by default. this->InitializeProgressMarks();