diff options
author | Craig Scott <craig.scott@crascit.com> | 2018-08-17 23:06:28 +0000 |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2018-08-17 19:06:37 -0400 |
commit | 786af7a7116ff4c7703f9dc3b6eaee1d8099ad2b (patch) | |
tree | e867b926adeb50ca2b849b4c1466e40f3132908a | |
parent | 39cfdd65565d9be4a4a00191a6ce8168c4c49b70 (diff) | |
parent | 16e17376c74b68d8e62658c63210a30da6b98428 (diff) | |
download | cmake-786af7a7116ff4c7703f9dc3b6eaee1d8099ad2b.tar.gz |
Merge topic 'evaluate-stdstring'
16e17376c7 EvaluateExpression() returns std::string
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2293
-rw-r--r-- | Source/cmGeneratorExpression.cxx | 4 | ||||
-rw-r--r-- | Source/cmGeneratorExpression.h | 17 |
2 files changed, 9 insertions, 12 deletions
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx index f26c717bb5..b1b2b8834e 100644 --- a/Source/cmGeneratorExpression.cxx +++ b/Source/cmGeneratorExpression.cxx @@ -390,7 +390,7 @@ const char* cmGeneratorExpressionInterpreter::Evaluate( const char* expression, const std::string& property) { if (this->Target.empty()) { - return this->EvaluateExpression(expression); + return this->EvaluateExpression(expression).c_str(); } // 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); + return this->EvaluateExpression(expression, &dagChecker).c_str(); } diff --git a/Source/cmGeneratorExpression.h b/Source/cmGeneratorExpression.h index 2899317f5b..1ceb7da0ec 100644 --- a/Source/cmGeneratorExpression.h +++ b/Source/cmGeneratorExpression.h @@ -181,7 +181,7 @@ public: const char* Evaluate(const char* expression) { - return this->EvaluateExpression(expression); + return this->EvaluateExpression(expression).c_str(); } const char* Evaluate(const std::string& expression) { @@ -212,7 +212,7 @@ protected: const std::string& GetTargetName() const { return this->Target; } const std::string& GetLanguage() const { return this->Language; } - const char* EvaluateExpression( + const std::string& EvaluateExpression( const char* expression, cmGeneratorExpressionDAGChecker* dagChecker = nullptr) { @@ -220,16 +220,13 @@ protected: this->GeneratorExpression.Parse(expression); if (dagChecker == nullptr) { - return this->CompiledGeneratorExpression - ->Evaluate(this->LocalGenerator, this->Config, false, - this->GeneratorTarget) - .c_str(); + return this->CompiledGeneratorExpression->Evaluate( + this->LocalGenerator, this->Config, false, this->GeneratorTarget); } - return this->CompiledGeneratorExpression - ->Evaluate(this->LocalGenerator, this->Config, false, - this->GeneratorTarget, dagChecker, this->Language) - .c_str(); + return this->CompiledGeneratorExpression->Evaluate( + this->LocalGenerator, this->Config, false, this->GeneratorTarget, + dagChecker, this->Language); } private: |