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/cmGlobalXCodeGenerator.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/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index e1ffe53..7456d3c 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -762,9 +762,10 @@ public: using cmGeneratorExpressionInterpreter::Evaluate; - const char* Evaluate(const char* expression, const std::string& property) + const std::string& Evaluate(const char* expression, + const std::string& property) { - const char* processed = + const std::string& processed = this->cmGeneratorExpressionInterpreter::Evaluate(expression, property); if (this->GetCompiledGeneratorExpression() .GetHadContextSensitiveCondition()) { @@ -821,7 +822,8 @@ cmXCodeObject* cmGlobalXCodeGenerator::CreateXCodeSourceFile( const std::string COMPILE_DEFINITIONS("COMPILE_DEFINITIONS"); if (const char* compile_defs = sf->GetProperty(COMPILE_DEFINITIONS)) { this->AppendDefines( - flagsBuild, genexInterpreter.Evaluate(compile_defs, COMPILE_DEFINITIONS), + flagsBuild, + genexInterpreter.Evaluate(compile_defs, COMPILE_DEFINITIONS).c_str(), true); } if (!flagsBuild.IsEmpty()) { |