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/cmake.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/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 2656849..45fa44b 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1487,10 +1487,10 @@ int cmake::Configure() this->Messenger->SetSuppressDeprecatedWarnings(value && cmIsOff(*value)); value = this->State->GetCacheEntryValue("CMAKE_ERROR_DEPRECATED"); - this->Messenger->SetDeprecatedWarningsAsErrors(value && cmIsOn(*value)); + this->Messenger->SetDeprecatedWarningsAsErrors(cmIsOn(value)); value = this->State->GetCacheEntryValue("CMAKE_SUPPRESS_DEVELOPER_WARNINGS"); - this->Messenger->SetSuppressDevWarnings(value && cmIsOn(*value)); + this->Messenger->SetSuppressDevWarnings(cmIsOn(value)); value = this->State->GetCacheEntryValue("CMAKE_SUPPRESS_DEVELOPER_ERRORS"); this->Messenger->SetDevWarningsAsErrors(value && cmIsOff(*value)); @@ -2742,9 +2742,7 @@ int cmake::Build(int jobs, const std::string& dir, } projName = *cachedProjectName; - cmProp cachedVerbose = - this->State->GetCacheEntryValue("CMAKE_VERBOSE_MAKEFILE"); - if (cachedVerbose && cmIsOn(*cachedVerbose)) { + if (cmIsOn(this->State->GetCacheEntryValue("CMAKE_VERBOSE_MAKEFILE"))) { verbose = true; } |