diff options
| author | Brad King <brad.king@kitware.com> | 2018-08-30 13:18:52 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-08-30 13:18:58 (GMT) |
| commit | d879999534d01451618395749287b5342e60783b (patch) | |
| tree | fc1f0ceaa4c02d6deed2c3ca56f7137b85ef77e6 /Source/cmGeneratorExpression.cxx | |
| parent | 17a60e398c8287aaa47d2e424189e8ba4a039aeb (diff) | |
| parent | 65ab9ce93882070191ad84fe96239e50d0b62b6e (diff) | |
| download | CMake-d879999534d01451618395749287b5342e60783b.zip CMake-d879999534d01451618395749287b5342e60783b.tar.gz CMake-d879999534d01451618395749287b5342e60783b.tar.bz2 | |
Merge topic 'genex-evaluate-stdstring'
65ab9ce938 Genex: Return Evaluate results as const std::string&
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2314
Diffstat (limited to 'Source/cmGeneratorExpression.cxx')
| -rw-r--r-- | Source/cmGeneratorExpression.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx index b1b2b88..6823cd5 100644 --- a/Source/cmGeneratorExpression.cxx +++ b/Source/cmGeneratorExpression.cxx @@ -386,11 +386,11 @@ void cmCompiledGeneratorExpression::GetMaxLanguageStandard( } } -const char* cmGeneratorExpressionInterpreter::Evaluate( +const std::string& cmGeneratorExpressionInterpreter::Evaluate( const char* expression, const std::string& property) { if (this->Target.empty()) { - return this->EvaluateExpression(expression).c_str(); + return this->EvaluateExpression(expression); } // 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).c_str(); + return this->EvaluateExpression(expression, &dagChecker); } |