kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmGlobalGenerator: Process evaluation files after target depends. 

No need to generate the files if computation aborts generation.
This commit is contained in:
Stephen Kelly 2015-08-29 09:18:01 +02:00
parent 1e5349a5a0
commit ec56d24451
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmGlobalGenerator.cxx
View File

@ -1330,8 +1330,6 @@ void cmGlobalGenerator::Generate()
this->LocalGenerators[i]->GenerateTargetManifest(); this->LocalGenerators[i]->GenerateTargetManifest();
} }
this->ProcessEvaluationFiles();
// Compute the inter-target dependencies. // Compute the inter-target dependencies.
if(!this->ComputeTargetDepends()) if(!this->ComputeTargetDepends())
{ {
@ -1342,6 +1340,8 @@ void cmGlobalGenerator::Generate()
// it builds by default. // it builds by default.
this->InitializeProgressMarks(); this->InitializeProgressMarks();
this->ProcessEvaluationFiles();
for (i = 0; i < this->LocalGenerators.size(); ++i) for (i = 0; i < this->LocalGenerators.size(); ++i)
{ {
this->LocalGenerators[i]->ComputeHomeRelativeOutputPath(); this->LocalGenerators[i]->ComputeHomeRelativeOutputPath();