kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmTarget: Move cmHeadToLinkInterfaceMap out.

This commit is contained in:
Stephen Kelly 2015-08-26 19:37:06 +02:00
parent f8ca51a054
commit 20993de464
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmLinkItem.h
View File

@ -96,4 +96,9 @@ struct cmOptionalLinkInterface: public cmLinkInterface
const char* ExplicitLibraries; const char* ExplicitLibraries;
}; };
struct cmHeadToLinkInterfaceMap:
public std::map<cmTarget const*, cmOptionalLinkInterface>
{
};
#endif #endif

10
Source/cmTarget.cxx
View File

@ -91,9 +91,7 @@ public:
// The backtrace when the target was created. // The backtrace when the target was created.
cmListFileBacktrace Backtrace; cmListFileBacktrace Backtrace;
struct HeadToLinkInterfaceMap: typedef std::map<std::string, cmHeadToLinkInterfaceMap>
public std::map<cmTarget const*, cmOptionalLinkInterface> {};
typedef std::map<std::string, HeadToLinkInterfaceMap>
LinkInterfaceMapType; LinkInterfaceMapType;
LinkInterfaceMapType LinkInterfaceMap; LinkInterfaceMapType LinkInterfaceMap;
LinkInterfaceMapType LinkInterfaceUsageRequirementsOnlyMap; LinkInterfaceMapType LinkInterfaceUsageRequirementsOnlyMap;
@ -4129,7 +4127,7 @@ cmLinkInterface const* cmTarget::GetLinkInterface(const std::string& config,
// Lookup any existing link interface for this configuration. // Lookup any existing link interface for this configuration.
std::string CONFIG = cmSystemTools::UpperCase(config); std::string CONFIG = cmSystemTools::UpperCase(config);
cmTargetInternals::HeadToLinkInterfaceMap& hm = cmHeadToLinkInterfaceMap& hm =
this->Internal->LinkInterfaceMap[CONFIG]; this->Internal->LinkInterfaceMap[CONFIG];
// If the link interface does not depend on the head target // If the link interface does not depend on the head target
@ -4180,7 +4178,7 @@ cmTarget::GetLinkInterfaceLibraries(const std::string& config,
// Lookup any existing link interface for this configuration. // Lookup any existing link interface for this configuration.
std::string CONFIG = cmSystemTools::UpperCase(config); std::string CONFIG = cmSystemTools::UpperCase(config);
cmTargetInternals::HeadToLinkInterfaceMap& hm = cmHeadToLinkInterfaceMap& hm =
(usage_requirements_only ? (usage_requirements_only ?
this->Internal->LinkInterfaceUsageRequirementsOnlyMap[CONFIG] : this->Internal->LinkInterfaceUsageRequirementsOnlyMap[CONFIG] :
this->Internal->LinkInterfaceMap[CONFIG]); this->Internal->LinkInterfaceMap[CONFIG]);
@ -4216,7 +4214,7 @@ cmTarget::GetImportLinkInterface(const std::string& config,
} }
std::string CONFIG = cmSystemTools::UpperCase(config); std::string CONFIG = cmSystemTools::UpperCase(config);
cmTargetInternals::HeadToLinkInterfaceMap& hm = cmHeadToLinkInterfaceMap& hm =
(usage_requirements_only ? (usage_requirements_only ?
this->Internal->LinkInterfaceUsageRequirementsOnlyMap[CONFIG] : this->Internal->LinkInterfaceUsageRequirementsOnlyMap[CONFIG] :
this->Internal->LinkInterfaceMap[CONFIG]); this->Internal->LinkInterfaceMap[CONFIG]);