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

QtAutogen: Use a target type between loops.

This commit is contained in:
Stephen Kelly 2015-10-05 19:21:56 +02:00
parent 5fb730174d
commit 1e757c318b
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmGlobalGenerator.cxx
View File

@ -1413,8 +1413,8 @@ cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
{ {
cmTargets& targets = cmTargets& targets =
this->LocalGenerators[i]->GetMakefile()->GetTargets(); this->LocalGenerators[i]->GetMakefile()->GetTargets();
std::vector<std::string> targetNames; std::vector<cmTarget*> filteredTargets;
targetNames.reserve(targets.size()); filteredTargets.reserve(targets.size());
for(cmTargets::iterator ti = targets.begin(); for(cmTargets::iterator ti = targets.begin();
ti != targets.end(); ++ti) ti != targets.end(); ++ti)
{ {
@ -1450,13 +1450,12 @@ cmGlobalGenerator::CreateQtAutoGeneratorsTargets()
} }
cmQtAutoGeneratorInitializer::InitializeAutogenSources(&ti->second); cmQtAutoGeneratorInitializer::InitializeAutogenSources(&ti->second);
targetNames.push_back(ti->second.GetName()); filteredTargets.push_back(&ti->second);
} }
for(std::vector<std::string>::iterator ti = targetNames.begin(); for(std::vector<cmTarget*>::iterator ti = filteredTargets.begin();
ti != targetNames.end(); ++ti) ti != filteredTargets.end(); ++ti)
{ {
cmTarget* target = this->LocalGenerators[i] cmTarget* target = *ti;
->GetMakefile()->FindTarget(*ti, true);
cmQtAutoGeneratorInitializer::InitializeAutogenTarget( cmQtAutoGeneratorInitializer::InitializeAutogenTarget(
this->LocalGenerators[i], target); this->LocalGenerators[i], target);
autogenTargets.push_back(target); autogenTargets.push_back(target);