diff options
author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-09-02 18:39:04 (GMT) |
---|---|---|
committer | Kyle Edwards <kyle.edwards@kitware.com> | 2020-09-02 18:39:04 (GMT) |
commit | 2a6471dd7bf3aa694a9a2bc7f554478d6fdcf8f5 (patch) | |
tree | 9f9cc0a1bb5cb21ed1cb40a68058f01007f67906 /Source/cmCacheManager.cxx | |
parent | a9fd3a107dc4bc34b8d2822b9153ee0ab9e02ea8 (diff) | |
parent | 68b674b8bc862f943863b48925a5c4d065de8f39 (diff) | |
download | CMake-2a6471dd7bf3aa694a9a2bc7f554478d6fdcf8f5.zip CMake-2a6471dd7bf3aa694a9a2bc7f554478d6fdcf8f5.tar.gz CMake-2a6471dd7bf3aa694a9a2bc7f554478d6fdcf8f5.tar.bz2 |
Merge branch 'master' into ninja-multi-automoc-regression
Diffstat (limited to 'Source/cmCacheManager.cxx')
-rw-r--r-- | Source/cmCacheManager.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx index 35bd681..95686ea 100644 --- a/Source/cmCacheManager.cxx +++ b/Source/cmCacheManager.cxx @@ -578,10 +578,7 @@ cmProp cmCacheManager::CacheEntry::GetProperty(const std::string& prop) const bool cmCacheManager::CacheEntry::GetPropertyAsBool( const std::string& prop) const { - if (cmProp value = this->GetProperty(prop)) { - return cmIsOn(*value); - } - return false; + return cmIsOn(this->GetProperty(prop)); } void cmCacheManager::CacheEntry::SetProperty(const std::string& prop, |