summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalGenerator.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-08-29 07:22:09 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-10-05 16:43:18 (GMT)
commit616f03114eb41218dc3278e72b52d8de09e40365 (patch)
treed7ada9f030e1bf0fc02af2ad79308307c53673b5 /Source/cmGlobalGenerator.cxx
parent9eea0486bfe5dfd497e6a8fca9e3c2551169c24e (diff)
downloadCMake-616f03114eb41218dc3278e72b52d8de09e40365.zip
CMake-616f03114eb41218dc3278e72b52d8de09e40365.tar.gz
CMake-616f03114eb41218dc3278e72b52d8de09e40365.tar.bz2
cmGlobalGenerator: Move path computation to Compute.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
-rw-r--r--Source/cmGlobalGenerator.cxx14
1 files changed, 6 insertions, 8 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index cae5466..3d073ca 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1305,26 +1305,24 @@ bool cmGlobalGenerator::Compute()
return false;
}
+ for (i = 0; i < this->LocalGenerators.size(); ++i)
+ {
+ this->LocalGenerators[i]->ComputeHomeRelativeOutputPath();
+ }
+
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();
this->ProcessEvaluationFiles();
- for (i = 0; i < this->LocalGenerators.size(); ++i)
- {
- this->LocalGenerators[i]->ComputeHomeRelativeOutputPath();
- }
-
// Generate project files
- for (i = 0; i < this->LocalGenerators.size(); ++i)
+ for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
{
this->SetCurrentMakefile(this->LocalGenerators[i]->GetMakefile());
this->LocalGenerators[i]->Generate();