From fc223f986066496654b4f2e392a40264c95cbd68 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 14 Apr 2020 10:30:22 -0400 Subject: cmGlobalXCodeGenerator: Fix genex interpreter overloads Overload both signatures to add Xcode-specific functionality. Co-Author: Vitaly Stakhovsky --- Source/cmGlobalXCodeGenerator.cxx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index bdc03c7..2191bc7 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -770,11 +770,15 @@ public: XCodeGeneratorExpressionInterpreter& operator=( XCodeGeneratorExpressionInterpreter const&) = delete; - using cmGeneratorExpressionInterpreter::Evaluate; - const std::string& Evaluate(const char* expression, const std::string& property) { + return this->Evaluate(std::string(expression ? expression : ""), property); + } + + const std::string& Evaluate(const std::string& expression, + const std::string& property) + { const std::string& processed = this->cmGeneratorExpressionInterpreter::Evaluate(expression, property); if (this->CompiledGeneratorExpression->GetHadContextSensitiveCondition()) { -- cgit v0.12