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

cmGlobalGenerator: Move path computation to Compute.

This commit is contained in:
Stephen Kelly 2015-08-29 09:22:09 +02:00
parent 9eea0486bf
commit 616f03114e
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmGlobalGenerator.cxx
View File

@ -1305,26 +1305,24 @@ bool cmGlobalGenerator::Compute()
return false; return false;
} }
for (i = 0; i < this->LocalGenerators.size(); ++i)
{
this->LocalGenerators[i]->ComputeHomeRelativeOutputPath();
}
return true; return true;
} }
void cmGlobalGenerator::Generate() void cmGlobalGenerator::Generate()
{ {
unsigned int i;
// Create a map from local generator to the complete set of targets // Create a map from local generator to the complete set of targets
// it builds by default. // it builds by default.
this->InitializeProgressMarks(); this->InitializeProgressMarks();
this->ProcessEvaluationFiles(); this->ProcessEvaluationFiles();
for (i = 0; i < this->LocalGenerators.size(); ++i)
{
this->LocalGenerators[i]->ComputeHomeRelativeOutputPath();
}
// Generate project files // 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->SetCurrentMakefile(this->LocalGenerators[i]->GetMakefile());
this->LocalGenerators[i]->Generate(); this->LocalGenerators[i]->Generate();