diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-07 23:05:41 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-12 16:39:58 (GMT) |
| commit | 61c02decce0c1b5aa78acd58d987a5d260079ca4 (patch) | |
| tree | 14d3fc28373471c9346aec525d5153ae84f6cfcc | |
| parent | 9ca4cae51e8fb67e628fe7b41eea3f459f148237 (diff) | |
| download | CMake-61c02decce0c1b5aa78acd58d987a5d260079ca4.zip CMake-61c02decce0c1b5aa78acd58d987a5d260079ca4.tar.gz CMake-61c02decce0c1b5aa78acd58d987a5d260079ca4.tar.bz2 | |
cmHeadToLinkInterfaceMap: Port to cmGeneratorTarget.
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 6 | ||||
| -rw-r--r-- | Source/cmLinkItem.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index d56559a..ef79d74 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -4490,7 +4490,7 @@ cmGeneratorTarget::GetLinkInterface(const std::string& config, return &hm.begin()->second; } - cmOptionalLinkInterface& iface = hm[head->Target]; + cmOptionalLinkInterface& iface = hm[head]; if(!iface.LibrariesDone) { iface.LibrariesDone = true; @@ -4642,7 +4642,7 @@ cmGeneratorTarget::GetLinkInterfaceLibraries(const std::string& config, return &hm.begin()->second; } - cmOptionalLinkInterface& iface = hm[head->Target]; + cmOptionalLinkInterface& iface = hm[head]; if(!iface.LibrariesDone) { iface.LibrariesDone = true; @@ -5079,7 +5079,7 @@ cmGeneratorTarget::GetImportLinkInterface(const std::string& config, return &hm.begin()->second; } - cmOptionalLinkInterface& iface = hm[headTarget->Target]; + cmOptionalLinkInterface& iface = hm[headTarget]; if(!iface.AllDone) { iface.AllDone = true; diff --git a/Source/cmLinkItem.h b/Source/cmLinkItem.h index 10dd465..33780a7 100644 --- a/Source/cmLinkItem.h +++ b/Source/cmLinkItem.h @@ -15,6 +15,7 @@ #include "cmListFileCache.h" +class cmGeneratorTarget; class cmTarget; // Basic information about each link item. @@ -97,7 +98,7 @@ struct cmOptionalLinkInterface: public cmLinkInterface }; struct cmHeadToLinkInterfaceMap: - public std::map<cmTarget const*, cmOptionalLinkInterface> + public std::map<cmGeneratorTarget const*, cmOptionalLinkInterface> { }; |