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

cmLocalGenerator: Simplify GetFeature implementation.

This commit is contained in:
Stephen Kelly 2015-08-02 09:14:28 +02:00
parent 314c9ae33b
commit ad0b0089ab
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmLocalGenerator.cxx
View File

@ -2368,19 +2368,15 @@ void cmLocalGenerator::AppendFeatureOptions(
const char* cmLocalGenerator::GetFeature(const std::string& feature, const char* cmLocalGenerator::GetFeature(const std::string& feature,
const std::string& config) const std::string& config)
{ {
std::string featureName = feature;
// TODO: Define accumulation policy for features (prepend, append, replace). // TODO: Define accumulation policy for features (prepend, append, replace).
// Currently we always replace. // Currently we always replace.
if(!config.empty()) if(!config.empty())
{ {
std::string featureConfig = feature; featureName += "_";
featureConfig += "_"; featureName += cmSystemTools::UpperCase(config);
featureConfig += cmSystemTools::UpperCase(config);
if(const char* value = this->Makefile->GetProperty(featureConfig))
{
return value;
}
} }
if(const char* value = this->Makefile->GetProperty(feature)) if(const char* value = this->Makefile->GetProperty(featureName))
{ {
return value; return value;
} }