summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalGenerator.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-10-18 14:53:00 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-10-21 21:21:01 (GMT)
commita8c0fbcc194bca6986492278e705ff301f283378 (patch)
tree6eca4050b77be5106654aa50a9ad60a499d2419a /Source/cmLocalGenerator.cxx
parente4b7d5afde91efafb59749a0a513732a089a6f0a (diff)
downloadCMake-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/cmLocalGenerator.cxx')
-rw-r--r--Source/cmLocalGenerator.cxx22
1 files changed, 11 insertions, 11 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 8a76c21..6959e1d 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -132,15 +132,15 @@ void cmLocalGenerator::TraceDependencies()
this->GlobalGenerator->CreateEvaluationSourceFiles(*ci);
}
// Generate the rule files for each target.
- 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;
}
- t->second->TraceDependencies();
+ (*t)->TraceDependencies();
}
}
@@ -448,9 +448,9 @@ void cmLocalGenerator::GenerateInstallRules()
}
-void cmLocalGenerator::AddGeneratorTarget(cmTarget* t, cmGeneratorTarget* gt)
+void cmLocalGenerator::AddGeneratorTarget(cmGeneratorTarget* gt)
{
- this->GeneratorTargets[t] = gt;
+ this->GeneratorTargets.push_back(gt);
}
//----------------------------------------------------------------------------
@@ -465,12 +465,12 @@ void cmLocalGenerator::ComputeTargetManifest()
}
// Add our targets to the manifest for each configuration.
- 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)
{
- cmGeneratorTarget& target = *t->second;
- if (target.GetType() == cmState::INTERFACE_LIBRARY)
+ cmGeneratorTarget* target = *t;
+ if (target->GetType() == cmState::INTERFACE_LIBRARY)
{
continue;
}
@@ -478,7 +478,7 @@ void cmLocalGenerator::ComputeTargetManifest()
ci != configNames.end(); ++ci)
{
const char* config = ci->c_str();
- target.ComputeTargetManifest(config);
+ target->ComputeTargetManifest(config);
}
}
}