From ec56d244512ae87e4e3e1fcf01aa0ef80ead8763 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sat, 29 Aug 2015 09:18:01 +0200 Subject: cmGlobalGenerator: Process evaluation files after target depends. No need to generate the files if computation aborts generation. --- Source/cmGlobalGenerator.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 97fa823..e6cbce3 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1330,8 +1330,6 @@ void cmGlobalGenerator::Generate() this->LocalGenerators[i]->GenerateTargetManifest(); } - this->ProcessEvaluationFiles(); - // Compute the inter-target dependencies. if(!this->ComputeTargetDepends()) { @@ -1342,6 +1340,8 @@ void cmGlobalGenerator::Generate() // it builds by default. this->InitializeProgressMarks(); + this->ProcessEvaluationFiles(); + for (i = 0; i < this->LocalGenerators.size(); ++i) { this->LocalGenerators[i]->ComputeHomeRelativeOutputPath(); -- cgit v0.12