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

cmTarget: Remove duplicate link interface map 

No target is both imported and not imported so we do not need separate
link interface maps for them.
This commit is contained in:
Brad King 2014-07-21 11:14:26 -04:00
parent 133cd996d1
commit 9d13e1679f
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmTarget.cxx
View File

@ -141,11 +141,6 @@ public:
LinkInterfaceMapType LinkInterfaceUsageRequirementsOnlyMap; LinkInterfaceMapType LinkInterfaceUsageRequirementsOnlyMap;
bool PolicyWarnedCMP0022; bool PolicyWarnedCMP0022;
typedef std::map<TargetConfigPair, OptionalLinkInterface>
ImportLinkInterfaceMapType;
ImportLinkInterfaceMapType ImportLinkInterfaceMap;
ImportLinkInterfaceMapType ImportLinkInterfaceUsageRequirementsOnlyMap;
typedef std::map<std::string, cmTarget::OutputInfo> OutputInfoMapType; typedef std::map<std::string, cmTarget::OutputInfo> OutputInfoMapType;
OutputInfoMapType OutputInfoMap; OutputInfoMapType OutputInfoMap;
@ -528,8 +523,6 @@ void cmTarget::ClearLinkMaps()
this->Internal->LinkImplMap.clear(); this->Internal->LinkImplMap.clear();
this->Internal->LinkInterfaceMap.clear(); this->Internal->LinkInterfaceMap.clear();
this->Internal->LinkInterfaceUsageRequirementsOnlyMap.clear(); this->Internal->LinkInterfaceUsageRequirementsOnlyMap.clear();
this->Internal->ImportLinkInterfaceMap.clear();
this->Internal->ImportLinkInterfaceUsageRequirementsOnlyMap.clear();
this->Internal->LinkClosureMap.clear(); this->Internal->LinkClosureMap.clear();
for (cmTargetLinkInformationMap::const_iterator it for (cmTargetLinkInformationMap::const_iterator it
= this->LinkInformation.begin(); = this->LinkInformation.begin();
@ -5826,10 +5819,10 @@ cmTarget::GetImportLinkInterface(const std::string& config,
} }
TargetConfigPair key(headTarget, cmSystemTools::UpperCase(config)); TargetConfigPair key(headTarget, cmSystemTools::UpperCase(config));
cmTargetInternals::ImportLinkInterfaceMapType& lim = cmTargetInternals::LinkInterfaceMapType& lim =
(usage_requirements_only ? (usage_requirements_only ?
this->Internal->ImportLinkInterfaceUsageRequirementsOnlyMap : this->Internal->LinkInterfaceUsageRequirementsOnlyMap :
this->Internal->ImportLinkInterfaceMap); this->Internal->LinkInterfaceMap);
cmTargetInternals::OptionalLinkInterface& iface = lim[key]; cmTargetInternals::OptionalLinkInterface& iface = lim[key];
if(!iface.AllDone) if(!iface.AllDone)