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.h | |
| 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.h')
| -rw-r--r-- | Source/cmMakefile.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index 3bccb63..b4ee3b8 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -909,7 +909,12 @@ protected: // libraries, classes, and executables mutable cmTargets Targets; - std::map<std::string, cmTarget*> AliasTargets; +#if defined(CMAKE_BUILD_WITH_CMAKE) + typedef cmsys::hash_map<std::string, cmTarget*> TargetMap; +#else + typedef std::map<std::string, cmTarget*> TargetMap; +#endif + TargetMap AliasTargets; cmGeneratorTargetsType GeneratorTargets; std::vector<cmSourceFile*> SourceFiles; @@ -1010,7 +1015,7 @@ private: friend class cmMakefileCall; std::vector<cmTarget*> ImportedTargetsOwned; - std::map<std::string, cmTarget*> ImportedTargets; + TargetMap ImportedTargets; // Internal policy stack management. void PushPolicy(bool weak = false, |