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/cmMakefile.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/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 9ad637a..801627a 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3858,8 +3858,7 @@ cmTarget* cmMakefile::FindTarget(const std::string& name, { if (!excludeAliases) { - std::map<std::string, cmTarget*>::const_iterator i - = this->AliasTargets.find(name); + TargetMap::const_iterator i = this->AliasTargets.find(name); if (i != this->AliasTargets.end()) { return i->second; @@ -4081,7 +4080,7 @@ cmTarget* cmMakefile::FindTargetToUse(const std::string& name, { // Look for an imported target. These take priority because they // are more local in scope and do not have to be globally unique. - std::map<std::string, cmTarget*>::const_iterator + TargetMap::const_iterator imported = this->ImportedTargets.find(name); if(imported != this->ImportedTargets.end()) { |