diff options
| author | Brad King <brad.king@kitware.com> | 2014-05-07 19:59:46 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-05-07 19:59:46 (GMT) |
| commit | 45f338e3d9fa73150348abc54f136cfdb001e654 (patch) | |
| tree | afcf2880123cfa3813817e542a11e211c1bafbd2 /Source/cmGlobalGenerator.cxx | |
| parent | 4777e82a0a47fcaa46e4e61b91273b9a993f88de (diff) | |
| parent | 325599caa2974f30d35f9ad0dbe1fc0760290b3e (diff) | |
| download | CMake-45f338e3d9fa73150348abc54f136cfdb001e654.zip CMake-45f338e3d9fa73150348abc54f136cfdb001e654.tar.gz CMake-45f338e3d9fa73150348abc54f136cfdb001e654.tar.bz2 | |
Merge topic 'dev/hashmap-for-targets'
325599ca cmGlobalGenerator: Store targets in hash maps
ac4106c6 cmMakefile: Use a hashmap for imported targets
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 1c48d39..2a30593 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -2085,15 +2085,13 @@ cmGlobalGenerator::FindTarget(const std::string& name, { if (!excludeAliases) { - std::map<std::string, cmTarget*>::const_iterator ai - = this->AliasTargets.find(name); + TargetMap::const_iterator ai = this->AliasTargets.find(name); if (ai != this->AliasTargets.end()) { return ai->second; } } - std::map<std::string,cmTarget *>::const_iterator i = - this->TotalTargets.find ( name ); + TargetMap::const_iterator i = this->TotalTargets.find ( name ); if ( i != this->TotalTargets.end() ) { return i->second; @@ -2874,7 +2872,7 @@ void cmGlobalGenerator::WriteSummary() cmGeneratedFileStream fout(fname.c_str()); // Generate summary information files for each target. - for(std::map<std::string,cmTarget *>::const_iterator ti = + for(TargetMap::const_iterator ti = this->TotalTargets.begin(); ti != this->TotalTargets.end(); ++ti) { if ((ti->second)->GetType() == cmTarget::INTERFACE_LIBRARY) |