From 61c02decce0c1b5aa78acd58d987a5d260079ca4 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 8 Oct 2015 01:05:41 +0200 Subject: [PATCH] cmHeadToLinkInterfaceMap: Port to cmGeneratorTarget. --- Source/cmGeneratorTarget.cxx | 6 +++--- Source/cmLinkItem.h | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index d56559a34..ef79d74d4 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 10dd465f8..33780a73f 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 + public std::map { };