diff options
author | Stephen Kelly <steveire@gmail.com> | 2015-10-18 14:53:00 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2015-10-21 21:21:01 (GMT) |
commit | a8c0fbcc194bca6986492278e705ff301f283378 (patch) | |
tree | 6eca4050b77be5106654aa50a9ad60a499d2419a /Source/cmLocalNinjaGenerator.cxx | |
parent | e4b7d5afde91efafb59749a0a513732a089a6f0a (diff) | |
download | CMake-a8c0fbcc194bca6986492278e705ff301f283378.zip CMake-a8c0fbcc194bca6986492278e705ff301f283378.tar.gz CMake-a8c0fbcc194bca6986492278e705ff301f283378.tar.bz2 |
cmLocalGenerator: Store a vector of generator targets.
Not a map from cmTarget to cmGeneratorTarget.
Diffstat (limited to 'Source/cmLocalNinjaGenerator.cxx')
-rw-r--r-- | Source/cmLocalNinjaGenerator.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index 756c139..3dd18bd 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -73,23 +73,23 @@ void cmLocalNinjaGenerator::Generate() } } - cmGeneratorTargetsType targets = this->GetGeneratorTargets(); - for(cmGeneratorTargetsType::iterator t = targets.begin(); + std::vector<cmGeneratorTarget*> targets = this->GetGeneratorTargets(); + for(std::vector<cmGeneratorTarget*>::iterator t = targets.begin(); t != targets.end(); ++t) { - if (t->second->GetType() == cmState::INTERFACE_LIBRARY) + if ((*t)->GetType() == cmState::INTERFACE_LIBRARY) { continue; } - cmNinjaTargetGenerator* tg = cmNinjaTargetGenerator::New(t->second); + cmNinjaTargetGenerator* tg = cmNinjaTargetGenerator::New(*t); if(tg) { tg->Generate(); // Add the target to "all" if required. if (!this->GetGlobalNinjaGenerator()->IsExcluded( this->GetGlobalNinjaGenerator()->GetLocalGenerators()[0], - t->second)) - this->GetGlobalNinjaGenerator()->AddDependencyToAll(t->second->Target); + *t)) + this->GetGlobalNinjaGenerator()->AddDependencyToAll((*t)->Target); delete tg; } } |