diff options
| author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-08-01 19:00:00 (GMT) |
|---|---|---|
| committer | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-09-02 11:27:32 (GMT) |
| commit | 11425041f04fd0945480b8f9e9933d1549b93981 (patch) | |
| tree | 9cafffd6774513f686440b31795cbb3b5e38b65c /Source/cmConditionEvaluator.cxx | |
| parent | 99b21e58e020fedc6d09a619c1a8dc2e9ea7e2c5 (diff) | |
| download | CMake-11425041f04fd0945480b8f9e9933d1549b93981.zip CMake-11425041f04fd0945480b8f9e9933d1549b93981.tar.gz CMake-11425041f04fd0945480b8f9e9933d1549b93981.tar.bz2 | |
cmMakefile::GetDefinition: return cmProp
Diffstat (limited to 'Source/cmConditionEvaluator.cxx')
| -rw-r--r-- | Source/cmConditionEvaluator.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/cmConditionEvaluator.cxx b/Source/cmConditionEvaluator.cxx index 7a3a3e8..daa9f4c 100644 --- a/Source/cmConditionEvaluator.cxx +++ b/Source/cmConditionEvaluator.cxx @@ -15,6 +15,7 @@ #include "cmMakefile.h" #include "cmMessageType.h" +#include "cmProperty.h" #include "cmState.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" @@ -143,7 +144,7 @@ const char* cmConditionEvaluator::GetDefinitionIfUnquoted( return nullptr; } - const char* def = this->Makefile.GetDefinition(argument.GetValue()); + cmProp def = this->Makefile.GetDefinition(argument.GetValue()); if (def && argument.WasQuoted() && this->Policy54Status == cmPolicies::WARN) { @@ -161,7 +162,7 @@ const char* cmConditionEvaluator::GetDefinitionIfUnquoted( } } - return def; + return cmToCStr(def); } //========================================================================= @@ -667,7 +668,7 @@ bool cmConditionEvaluator::HandleLevel2(cmArgumentList& newArgs, bool result = false; def = this->GetVariableOrString(*arg); - def2 = this->Makefile.GetDefinition(argP2->GetValue()); + def2 = cmToCStr(this->Makefile.GetDefinition(argP2->GetValue())); if (def2) { std::vector<std::string> list = cmExpandedList(def2, true); |