diff options
| author | Brad King <brad.king@kitware.com> | 2013-08-28 13:11:04 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-08-28 13:11:04 (GMT) |
| commit | b6f6802b3d0dc1a9ab7beb62a17bd0651d87a64f (patch) | |
| tree | 06cdd509b83888c91668bbebbbd5afbedb86bca1 | |
| parent | 150bc7da3dba160acab5cb11387c9a29255973ac (diff) | |
| parent | 15d98a42fd2b7cadfdbc9268da3c79f389c5a3cc (diff) | |
| download | CMake-b6f6802b3d0dc1a9ab7beb62a17bd0651d87a64f.zip CMake-b6f6802b3d0dc1a9ab7beb62a17bd0651d87a64f.tar.gz CMake-b6f6802b3d0dc1a9ab7beb62a17bd0651d87a64f.tar.bz2 | |
Merge topic 'fix-MAP_IMPORTED_CONFIG-evaluation'
15d98a4 Genex: Fix evaluation of MAP_IMPORTED_CONFIG_<CONFIG>
| -rw-r--r-- | Source/cmGeneratorExpressionEvaluator.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx index e0c8c9e..abe4e70 100644 --- a/Source/cmGeneratorExpressionEvaluator.cxx +++ b/Source/cmGeneratorExpressionEvaluator.cxx @@ -574,14 +574,15 @@ static const struct ConfigurationTestNode : public cmGeneratorExpressionNode // Check if there is a proper config mapping for the tested config. std::vector<std::string> mappedConfigs; std::string mapProp = "MAP_IMPORTED_CONFIG_"; - mapProp += context->Config; + mapProp += cmSystemTools::UpperCase(context->Config); if(const char* mapValue = context->CurrentTarget->GetProperty(mapProp.c_str())) { cmSystemTools::ExpandListArgument(cmSystemTools::UpperCase(mapValue), mappedConfigs); return std::find(mappedConfigs.begin(), mappedConfigs.end(), - context->Config) != mappedConfigs.end() ? "1" : "0"; + cmSystemTools::UpperCase(parameters.front())) + != mappedConfigs.end() ? "1" : "0"; } } } |