diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-25 11:43:00 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-27 06:44:24 (GMT) |
| commit | a67231ac114235f0af4673235c4c07fa896c8ab6 (patch) | |
| tree | 0c23756461e3a26b8a27fc3e340c928b1ca7f62a /Source/cmGlobalGenerator.h | |
| parent | d566f39a640297114bd3ad933bb3279440b2f38f (diff) | |
| download | CMake-a67231ac114235f0af4673235c4c07fa896c8ab6.zip CMake-a67231ac114235f0af4673235c4c07fa896c8ab6.tar.gz CMake-a67231ac114235f0af4673235c4c07fa896c8ab6.tar.bz2 | |
cmTarget: Implement ALIAS in terms of name mapping
Remove mapping to cmTarget.
Diffstat (limited to 'Source/cmGlobalGenerator.h')
| -rw-r--r-- | Source/cmGlobalGenerator.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 5d4ce08..419cada 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -254,7 +254,7 @@ public: cmTarget* FindTarget(const std::string& name, bool excludeAliases = false) const; - void AddAlias(const std::string& name, cmTarget *tgt); + void AddAlias(const std::string& name, const std::string& tgtName); bool IsAlias(const std::string& name) const; /** Determine if a name resolves to a framework on disk or a built target @@ -427,17 +427,7 @@ protected: std::map<std::string, cmExportBuildFileGenerator*> BuildExportSets; std::map<std::string, cmExportBuildFileGenerator*> BuildExportExportSets; - // All targets in the entire project. -#if defined(CMAKE_BUILD_WITH_CMAKE) -#ifdef CMake_HAVE_CXX11_UNORDERED_MAP - typedef std::unordered_map<std::string, cmTarget*> TargetMap; -#else - typedef cmsys::hash_map<std::string, cmTarget*> TargetMap; -#endif -#else - typedef std::map<std::string,cmTarget *> TargetMap; -#endif - TargetMap AliasTargets; + std::map<std::string, std::string> AliasTargets; cmTarget* FindTargetImpl(std::string const& name) const; cmTarget* FindImportedTargetImpl(std::string const& name) const; |