diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-25 10:37:34 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-27 06:44:23 (GMT) |
| commit | 7f6beddae372a7ae47789f5460bcdfdac39c64e6 (patch) | |
| tree | 1a2f668bf948c961fab8830e9f1922850d1e6132 /Source | |
| parent | 520ca0ff6c123250c633a3618459d0161cbc4683 (diff) | |
| download | CMake-7f6beddae372a7ae47789f5460bcdfdac39c64e6.zip CMake-7f6beddae372a7ae47789f5460bcdfdac39c64e6.tar.gz CMake-7f6beddae372a7ae47789f5460bcdfdac39c64e6.tar.bz2 | |
cmGeneratorTarget: Port cmOptionalLinkImplementation
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 4 | ||||
| -rw-r--r-- | Source/cmGeneratorTarget.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 3df43ff..e19d5e5 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -5560,7 +5560,7 @@ cmGeneratorTarget::GetLinkImplementation(const std::string& config) const } std::string CONFIG = cmSystemTools::UpperCase(config); - cmOptionalLinkImplementation& impl = this->LinkImplMap[CONFIG][this->Target]; + cmOptionalLinkImplementation& impl = this->LinkImplMap[CONFIG][this]; if(!impl.LibrariesDone) { impl.LibrariesDone = true; @@ -5840,7 +5840,7 @@ cmGeneratorTarget::GetLinkImplementationLibrariesInternal( return &hm.begin()->second; } - cmOptionalLinkImplementation& impl = hm[head->Target]; + cmOptionalLinkImplementation& impl = hm[head]; if(!impl.LibrariesDone) { impl.LibrariesDone = true; diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h index 3c6f267..c2607a7 100644 --- a/Source/cmGeneratorTarget.h +++ b/Source/cmGeneratorTarget.h @@ -647,7 +647,7 @@ private: const std::string& config) const; struct HeadToLinkImplementationMap: - public std::map<cmTarget const*, cmOptionalLinkImplementation> {}; + public std::map<cmGeneratorTarget const*, cmOptionalLinkImplementation> {}; typedef std::map<std::string, HeadToLinkImplementationMap> LinkImplMapType; mutable LinkImplMapType LinkImplMap; |