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

Merge topic 'fix-MAP_IMPORTED_CONFIG-evaluation'

Browse Source 
15d98a4 Genex: Fix evaluation of MAP_IMPORTED_CONFIG_<CONFIG>
This commit is contained in:
Brad King 2013-08-28 09:11:04 -04:00 committed by CMake Topic Stage
commit b6f6802b3d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmGeneratorExpressionEvaluator.cxx
View File

@ -574,14 +574,15 @@ static const struct ConfigurationTestNode : public cmGeneratorExpressionNode
// Check if there is a proper config mapping for the tested config. // Check if there is a proper config mapping for the tested config.
std::vector<std::string> mappedConfigs; std::vector<std::string> mappedConfigs;
std::string mapProp = "MAP_IMPORTED_CONFIG_"; std::string mapProp = "MAP_IMPORTED_CONFIG_";
mapProp += context->Config; mapProp += cmSystemTools::UpperCase(context->Config);
if(const char* mapValue = if(const char* mapValue =
context->CurrentTarget->GetProperty(mapProp.c_str())) context->CurrentTarget->GetProperty(mapProp.c_str()))
{ {
cmSystemTools::ExpandListArgument(cmSystemTools::UpperCase(mapValue), cmSystemTools::ExpandListArgument(cmSystemTools::UpperCase(mapValue),
mappedConfigs); mappedConfigs);
return std::find(mappedConfigs.begin(), mappedConfigs.end(), return std::find(mappedConfigs.begin(), mappedConfigs.end(),
context->Config) != mappedConfigs.end() ? "1" : "0"; cmSystemTools::UpperCase(parameters.front()))
!= mappedConfigs.end() ? "1" : "0";
} }
} }
} }