diff options
| author | Brad King <brad.king@kitware.com> | 2020-07-14 11:19:20 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-07-14 11:19:26 (GMT) |
| commit | 2455ec9565a570557ba1cf1417d27e6bdcb65614 (patch) | |
| tree | 32f9adaa614562444e39acfcffec327f599dd42a | |
| parent | a14c38a186f2099fc5d9a5b38e6257889c7b8e58 (diff) | |
| parent | 43f7b17816e2de899dc5e9d0ed650c615e455eb3 (diff) | |
| download | CMake-2455ec9565a570557ba1cf1417d27e6bdcb65614.zip CMake-2455ec9565a570557ba1cf1417d27e6bdcb65614.tar.gz CMake-2455ec9565a570557ba1cf1417d27e6bdcb65614.tar.bz2 | |
Merge topic 'evaluate-cleanup'
43f7b17816 cmGeneratorExpressionInterpreter::Evaluate: remove const char* overload
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5003
| -rw-r--r-- | Source/cmGeneratorExpression.cxx | 6 | ||||
| -rw-r--r-- | Source/cmGeneratorExpression.h | 2 | ||||
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 8 |
3 files changed, 3 insertions, 13 deletions
diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx index 6e293d5..840f511 100644 --- a/Source/cmGeneratorExpression.cxx +++ b/Source/cmGeneratorExpression.cxx @@ -406,9 +406,3 @@ const std::string& cmGeneratorExpressionInterpreter::Evaluate( this->LocalGenerator, this->Config, this->HeadTarget, &dagChecker, nullptr, this->Language); } - -const std::string& cmGeneratorExpressionInterpreter::Evaluate( - const char* expression, const std::string& property) -{ - return this->Evaluate(std::string(expression ? expression : ""), property); -} diff --git a/Source/cmGeneratorExpression.h b/Source/cmGeneratorExpression.h index 75bba02..09d8b88 100644 --- a/Source/cmGeneratorExpression.h +++ b/Source/cmGeneratorExpression.h @@ -199,8 +199,6 @@ public: const std::string& Evaluate(std::string expression, const std::string& property); - const std::string& Evaluate(const char* expression, - const std::string& property); protected: cmGeneratorExpression GeneratorExpression; diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index ccd8e7e..b202e91 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -5411,8 +5411,7 @@ bool getTypedProperty<bool>(cmGeneratorTarget const* tgt, } cmProp value = tgt->GetProperty(prop); - return cmIsOn( - genexInterpreter->Evaluate(value ? value->c_str() : nullptr, prop)); + return cmIsOn(genexInterpreter->Evaluate(value ? *value : "", prop)); } template <> @@ -5426,8 +5425,7 @@ const char* getTypedProperty<const char*>( return value ? value->c_str() : nullptr; } - return genexInterpreter->Evaluate(value ? value->c_str() : nullptr, prop) - .c_str(); + return genexInterpreter->Evaluate(value ? *value : "", prop).c_str(); } template <> @@ -5441,7 +5439,7 @@ std::string getTypedProperty<std::string>( return valueAsString(value ? value->c_str() : nullptr); } - return genexInterpreter->Evaluate(value ? value->c_str() : nullptr, prop); + return genexInterpreter->Evaluate(value ? *value : "", prop); } template <typename PropertyType> |