diff options
| author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-07-14 01:00:00 (GMT) |
|---|---|---|
| committer | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-07-14 12:22:24 (GMT) |
| commit | 715691124240b696c8be1d7cd6ce6dbb09381c67 (patch) | |
| tree | 85829a543a5d041e7329ae2e447b3d261ea640b8 /Source/cmMakefile.cxx | |
| parent | 2da778664d3e99ada4e67a5a1b9d377f92a9f75f (diff) | |
| download | CMake-715691124240b696c8be1d7cd6ce6dbb09381c67.zip CMake-715691124240b696c8be1d7cd6ce6dbb09381c67.tar.gz CMake-715691124240b696c8be1d7cd6ce6dbb09381c67.tar.bz2 | |
cmIsOn: add overload accepting const std::string*
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 75c8934..aca40fa 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -2521,8 +2521,7 @@ void cmMakefile::ExpandVariablesCMP0019() bool cmMakefile::IsOn(const std::string& name) const { - const char* value = this->GetDefinition(name); - return cmIsOn(value); + return cmIsOn(this->GetDef(name)); } bool cmMakefile::IsSet(const std::string& name) const @@ -4116,8 +4115,7 @@ cmProp cmMakefile::GetProperty(const std::string& prop, bool chain) const bool cmMakefile::GetPropertyAsBool(const std::string& prop) const { - cmProp p = this->GetProperty(prop); - return p && cmIsOn(*p); + return cmIsOn(this->GetProperty(prop)); } std::vector<std::string> cmMakefile::GetPropertyKeys() const |