diff options
author | Brad King <brad.king@kitware.com> | 2014-07-21 15:14:26 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2014-07-21 15:16:45 (GMT) |
commit | 9d13e1679f2b52e88748a710edd201ed9fba7447 (patch) | |
tree | d7c72d5846dddc3404d32048fdd7565a7c7e623d /Source/cmTarget.cxx | |
parent | 133cd996d161cd349e67d90052ac4e20d9488620 (diff) | |
download | CMake-9d13e1679f2b52e88748a710edd201ed9fba7447.zip CMake-9d13e1679f2b52e88748a710edd201ed9fba7447.tar.gz CMake-9d13e1679f2b52e88748a710edd201ed9fba7447.tar.bz2 |
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.
Diffstat (limited to 'Source/cmTarget.cxx')
-rw-r--r-- | Source/cmTarget.cxx | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 9d00591..dc8384d 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -141,11 +141,6 @@ public: LinkInterfaceMapType LinkInterfaceUsageRequirementsOnlyMap; bool PolicyWarnedCMP0022; - typedef std::map<TargetConfigPair, OptionalLinkInterface> - ImportLinkInterfaceMapType; - ImportLinkInterfaceMapType ImportLinkInterfaceMap; - ImportLinkInterfaceMapType ImportLinkInterfaceUsageRequirementsOnlyMap; - typedef std::map<std::string, cmTarget::OutputInfo> OutputInfoMapType; OutputInfoMapType OutputInfoMap; @@ -528,8 +523,6 @@ void cmTarget::ClearLinkMaps() this->Internal->LinkImplMap.clear(); this->Internal->LinkInterfaceMap.clear(); this->Internal->LinkInterfaceUsageRequirementsOnlyMap.clear(); - this->Internal->ImportLinkInterfaceMap.clear(); - this->Internal->ImportLinkInterfaceUsageRequirementsOnlyMap.clear(); this->Internal->LinkClosureMap.clear(); for (cmTargetLinkInformationMap::const_iterator it = this->LinkInformation.begin(); @@ -5826,10 +5819,10 @@ cmTarget::GetImportLinkInterface(const std::string& config, } TargetConfigPair key(headTarget, cmSystemTools::UpperCase(config)); - cmTargetInternals::ImportLinkInterfaceMapType& lim = + cmTargetInternals::LinkInterfaceMapType& lim = (usage_requirements_only ? - this->Internal->ImportLinkInterfaceUsageRequirementsOnlyMap : - this->Internal->ImportLinkInterfaceMap); + this->Internal->LinkInterfaceUsageRequirementsOnlyMap : + this->Internal->LinkInterfaceMap); cmTargetInternals::OptionalLinkInterface& iface = lim[key]; if(!iface.AllDone) |