diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-08-26 17:37:06 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-08-26 17:37:06 (GMT) |
| commit | 20993de46444e0f74700a641b54a8ca7e015bac4 (patch) | |
| tree | cf304609fe7d56bd8a3b40ba4061670d91bdbf40 /Source | |
| parent | f8ca51a054732d5b0e2c6052ee102b748bd5848c (diff) | |
| download | CMake-20993de46444e0f74700a641b54a8ca7e015bac4.zip CMake-20993de46444e0f74700a641b54a8ca7e015bac4.tar.gz CMake-20993de46444e0f74700a641b54a8ca7e015bac4.tar.bz2 | |
cmTarget: Move cmHeadToLinkInterfaceMap out.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLinkItem.h | 5 | ||||
| -rw-r--r-- | Source/cmTarget.cxx | 10 |
2 files changed, 9 insertions, 6 deletions
diff --git a/Source/cmLinkItem.h b/Source/cmLinkItem.h index eb585ab..91220b8 100644 --- a/Source/cmLinkItem.h +++ b/Source/cmLinkItem.h @@ -96,4 +96,9 @@ struct cmOptionalLinkInterface: public cmLinkInterface const char* ExplicitLibraries; }; +struct cmHeadToLinkInterfaceMap: + public std::map<cmTarget const*, cmOptionalLinkInterface> +{ +}; + #endif diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 60453e1..a10cb86 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -91,9 +91,7 @@ public: // The backtrace when the target was created. cmListFileBacktrace Backtrace; - struct HeadToLinkInterfaceMap: - public std::map<cmTarget const*, cmOptionalLinkInterface> {}; - typedef std::map<std::string, HeadToLinkInterfaceMap> + typedef std::map<std::string, cmHeadToLinkInterfaceMap> LinkInterfaceMapType; LinkInterfaceMapType LinkInterfaceMap; LinkInterfaceMapType LinkInterfaceUsageRequirementsOnlyMap; @@ -4129,7 +4127,7 @@ cmLinkInterface const* cmTarget::GetLinkInterface(const std::string& config, // Lookup any existing link interface for this configuration. std::string CONFIG = cmSystemTools::UpperCase(config); - cmTargetInternals::HeadToLinkInterfaceMap& hm = + cmHeadToLinkInterfaceMap& hm = this->Internal->LinkInterfaceMap[CONFIG]; // 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. std::string CONFIG = cmSystemTools::UpperCase(config); - cmTargetInternals::HeadToLinkInterfaceMap& hm = + cmHeadToLinkInterfaceMap& hm = (usage_requirements_only ? this->Internal->LinkInterfaceUsageRequirementsOnlyMap[CONFIG] : this->Internal->LinkInterfaceMap[CONFIG]); @@ -4216,7 +4214,7 @@ cmTarget::GetImportLinkInterface(const std::string& config, } std::string CONFIG = cmSystemTools::UpperCase(config); - cmTargetInternals::HeadToLinkInterfaceMap& hm = + cmHeadToLinkInterfaceMap& hm = (usage_requirements_only ? this->Internal->LinkInterfaceUsageRequirementsOnlyMap[CONFIG] : this->Internal->LinkInterfaceMap[CONFIG]); |