diff options
| author | Brad King <brad.king@kitware.com> | 2020-04-14 14:30:22 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-04-14 14:56:45 (GMT) |
| commit | fc223f986066496654b4f2e392a40264c95cbd68 (patch) | |
| tree | b4227e898e2895dbd95d5605b6cd26feaace0d55 | |
| parent | 734238d64f292af9d3f68742c18b0ac96b78ac06 (diff) | |
| download | CMake-fc223f986066496654b4f2e392a40264c95cbd68.zip CMake-fc223f986066496654b4f2e392a40264c95cbd68.tar.gz CMake-fc223f986066496654b4f2e392a40264c95cbd68.tar.bz2 | |
cmGlobalXCodeGenerator: Fix genex interpreter overloads
Overload both signatures to add Xcode-specific functionality.
Co-Author: Vitaly Stakhovsky <vvs31415@gitlab.org>
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 8 |
1 files 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()) { |