diff options
author | Stephen Kelly <steveire@gmail.com> | 2012-09-20 06:32:58 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2012-09-20 06:34:30 (GMT) |
commit | 879fd354c1db7da04ab244ab8262ec1391ff30e6 (patch) | |
tree | 27d05a0b00e18290b309d5f03231182a5e1027d3 /Source/cmLocalGenerator.cxx | |
parent | 6674583caa20244d90aa14a67d059e7228a9f169 (diff) | |
download | CMake-879fd354c1db7da04ab244ab8262ec1391ff30e6.zip CMake-879fd354c1db7da04ab244ab8262ec1391ff30e6.tar.gz CMake-879fd354c1db7da04ab244ab8262ec1391ff30e6.tar.bz2 |
Revert "Move GenerateTargetManifest to cmGeneratorTarget."
This reverts commit 987e12e2f962b6e9ed9f15f8ff486512911b744e.
GenerateTargetManifest is called by the global generator before it
creates the generator targets, so we can't move it to cmGeneratorTarget
yet.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
-rw-r--r-- | Source/cmLocalGenerator.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 662f876..62b6ce7 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -533,11 +533,10 @@ void cmLocalGenerator::GenerateTargetManifest() this->Makefile->GetConfigurations(configNames); // Add our targets to the manifest for each configuration. - cmGeneratorTargetsType targets = this->Makefile->GetGeneratorTargets(); - for(cmGeneratorTargetsType::iterator t = targets.begin(); - t != targets.end(); ++t) + cmTargets& targets = this->Makefile->GetTargets(); + for(cmTargets::iterator t = targets.begin(); t != targets.end(); ++t) { - cmGeneratorTarget& target = *t->second; + cmTarget& target = t->second; if(configNames.empty()) { target.GenerateTargetManifest(0); |