diff options
| author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2018-08-25 23:57:00 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-08-28 17:56:29 (GMT) |
| commit | 65ab9ce93882070191ad84fe96239e50d0b62b6e (patch) | |
| tree | d2f52de2bf29664c675b2f3f328a459c795b1537 /Source/cmGlobalXCodeGenerator.cxx | |
| parent | 0b26ab15c4b2c61e377b46d5b912a2893ef65e26 (diff) | |
| download | CMake-65ab9ce93882070191ad84fe96239e50d0b62b6e.zip CMake-65ab9ce93882070191ad84fe96239e50d0b62b6e.tar.gz CMake-65ab9ce93882070191ad84fe96239e50d0b62b6e.tar.bz2 | |
Genex: Return Evaluate results as const std::string&
Also remove unused overloads.
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 042ce41..37536fc 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()) { |