summaryrefslogtreecommitdiffstats
path: root/Source/cmGeneratorExpression.cxx
diff options
context:
space:
mode:
authorVitaly Stakhovsky <vvs31415@gitlab.org>2018-08-16 12:09:42 (GMT)
committerVitaly Stakhovsky <vvs31415@gitlab.org>2018-08-16 12:09:42 (GMT)
commit16e17376c74b68d8e62658c63210a30da6b98428 (patch)
tree739d4fd75db722cfea8b99e1e6bf067011c8da5d /Source/cmGeneratorExpression.cxx
parentba122ad2a48c58653dc033345f87fa6a717a8c8a (diff)
downloadCMake-16e17376c74b68d8e62658c63210a30da6b98428.zip
CMake-16e17376c74b68d8e62658c63210a30da6b98428.tar.gz
CMake-16e17376c74b68d8e62658c63210a30da6b98428.tar.bz2
EvaluateExpression() returns std::string
Diffstat (limited to 'Source/cmGeneratorExpression.cxx')
-rw-r--r--Source/cmGeneratorExpression.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index f26c717..b1b2b88 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -390,7 +390,7 @@ const char* cmGeneratorExpressionInterpreter::Evaluate(
const char* expression, const std::string& property)
{
if (this->Target.empty()) {
- return this->EvaluateExpression(expression);
+ return this->EvaluateExpression(expression).c_str();
}
// Specify COMPILE_OPTIONS to DAGchecker, same semantic as COMPILE_FLAGS
@@ -398,5 +398,5 @@ const char* cmGeneratorExpressionInterpreter::Evaluate(
this->Target, property == "COMPILE_FLAGS" ? "COMPILE_OPTIONS" : property,
nullptr, nullptr);
- return this->EvaluateExpression(expression, &dagChecker);
+ return this->EvaluateExpression(expression, &dagChecker).c_str();
}