Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-18 17:31:57 +08:00
Code Issues Projects Releases Wiki Activity

cmTarget: Refactor GetMappedConfig to choose location property up front

Browse Source 
Store the `IMPORTED_LOCATION` property name in a variable up front
to avoid duplicating the string literal.
This commit is contained in:
Brad King
2016-11-03 16:10:31 -04:00
parent 479932fa32
commit 1d1f1eeb6a
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmTarget.cxx
View File

@@ -1387,6 +1387,8 @@ bool cmTarget::GetMappedConfig(std::string const& desired_config,
return true; return true;
} }
std::string const locPropBase = "IMPORTED_LOCATION";
// Track the configuration-specific property suffix. // Track the configuration-specific property suffix.
suffix = "_"; suffix = "_";
suffix += desired_config; suffix += desired_config;
@@ -1412,7 +1414,7 @@ bool cmTarget::GetMappedConfig(std::string const& desired_config,
if (mci->empty()) { if (mci->empty()) {
// An empty string in the mapping has a special meaning: // An empty string in the mapping has a special meaning:
// look up the config-less properties. // look up the config-less properties.
*loc = this->GetProperty("IMPORTED_LOCATION"); *loc = this->GetProperty(locPropBase);
if (allowImp) { if (allowImp) {
*imp = this->GetProperty("IMPORTED_IMPLIB"); *imp = this->GetProperty("IMPORTED_IMPLIB");
} }
@@ -1422,7 +1424,7 @@ bool cmTarget::GetMappedConfig(std::string const& desired_config,
} }
} else { } else {
std::string mcUpper = cmSystemTools::UpperCase(*mci); std::string mcUpper = cmSystemTools::UpperCase(*mci);
std::string locProp = "IMPORTED_LOCATION_"; std::string locProp = locPropBase + "_";
locProp += mcUpper; locProp += mcUpper;
*loc = this->GetProperty(locProp); *loc = this->GetProperty(locProp);
if (allowImp) { if (allowImp) {
@@ -1449,7 +1451,7 @@ bool cmTarget::GetMappedConfig(std::string const& desired_config,
// If we have not yet found it then there are no mapped // If we have not yet found it then there are no mapped
// configurations. Look for an exact-match. // configurations. Look for an exact-match.
if (!*loc && !*imp) { if (!*loc && !*imp) {
std::string locProp = "IMPORTED_LOCATION"; std::string locProp = locPropBase;
locProp += suffix; locProp += suffix;
*loc = this->GetProperty(locProp); *loc = this->GetProperty(locProp);
if (allowImp) { if (allowImp) {
@@ -1467,7 +1469,7 @@ bool cmTarget::GetMappedConfig(std::string const& desired_config,
// Look for a configuration-less location. This may be set by // Look for a configuration-less location. This may be set by
// manually-written code. // manually-written code.
*loc = this->GetProperty("IMPORTED_LOCATION"); *loc = this->GetProperty(locPropBase);
if (allowImp) { if (allowImp) {
*imp = this->GetProperty("IMPORTED_IMPLIB"); *imp = this->GetProperty("IMPORTED_IMPLIB");
} }
@@ -1485,7 +1487,7 @@ bool cmTarget::GetMappedConfig(std::string const& desired_config,
!*loc && !*imp && aci != availableConfigs.end(); ++aci) { !*loc && !*imp && aci != availableConfigs.end(); ++aci) {
suffix = "_"; suffix = "_";
suffix += cmSystemTools::UpperCase(*aci); suffix += cmSystemTools::UpperCase(*aci);
std::string locProp = "IMPORTED_LOCATION"; std::string locProp = locPropBase;
locProp += suffix; locProp += suffix;
*loc = this->GetProperty(locProp); *loc = this->GetProperty(locProp);
if (allowImp) { if (allowImp) {