diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-08-29 07:18:01 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-08-29 07:18:01 (GMT) |
| commit | ec56d244512ae87e4e3e1fcf01aa0ef80ead8763 (patch) | |
| tree | b412482b0ba1602433ad4db942da556abf54be99 /Source/cmGlobalGenerator.cxx | |
| parent | 1e5349a5a0162cf5f75639717d374e73358df7b2 (diff) | |
| download | CMake-ec56d244512ae87e4e3e1fcf01aa0ef80ead8763.zip CMake-ec56d244512ae87e4e3e1fcf01aa0ef80ead8763.tar.gz CMake-ec56d244512ae87e4e3e1fcf01aa0ef80ead8763.tar.bz2 | |
cmGlobalGenerator: Process evaluation files after target depends.
No need to generate the files if computation aborts generation.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 4 |
1 files 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(); |