summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2013-01-31 10:18:49 (GMT)
committerStephen Kelly <steveire@gmail.com>2013-01-31 10:18:49 (GMT)
commit30268b46f8237f25c82858693c000f5da8ede6ad (patch)
tree5d14f3be6bea68bf25df9984306d045e1e2da6d0 /Source
parentda2b0245a380282892be8007f4c3d184a91bcfe0 (diff)
downloadCMake-30268b46f8237f25c82858693c000f5da8ede6ad.zip
CMake-30268b46f8237f25c82858693c000f5da8ede6ad.tar.gz
CMake-30268b46f8237f25c82858693c000f5da8ede6ad.tar.bz2
Handle reading empty properties defined by the link interface.
This was segfaulting before.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmGeneratorExpressionEvaluator.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx b/Source/cmGeneratorExpressionEvaluator.cxx
index f74b69e..55f54e4 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -465,9 +465,11 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
if (target->IsLinkInterfaceDependentStringProperty(propertyName,
context->Config))
{
- return target->GetLinkInterfaceDependentStringProperty(
+ const char *propContent =
+ target->GetLinkInterfaceDependentStringProperty(
propertyName,
context->Config);
+ return propContent ? propContent : "";
}
return std::string();