diff options
Diffstat (limited to 'Source/cmCacheManager.cxx')
| -rw-r--r-- | Source/cmCacheManager.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx index e8fc350..6b61f1b 100644 --- a/Source/cmCacheManager.cxx +++ b/Source/cmCacheManager.cxx @@ -14,6 +14,7 @@ #include "cmMessageType.h" #include "cmMessenger.h" #include "cmState.h" +#include "cmStringAlgorithms.h" #include "cmSystemTools.h" #include "cmVersion.h" @@ -26,8 +27,7 @@ cmCacheManager::cmCacheManager() void cmCacheManager::CleanCMakeFiles(const std::string& path) { std::string glob = path; - glob += "/CMakeFiles"; - glob += "/*.cmake"; + glob += "/CMakeFiles/*.cmake"; cmsys::Glob globIt; globIt.FindFiles(glob); std::vector<std::string> files = globIt.GetFiles(); @@ -552,7 +552,7 @@ void cmCacheManager::AddCacheEntry(const std::string& key, const char* value, if (type == cmStateEnums::FILEPATH || type == cmStateEnums::PATH) { if (e.Value.find(';') != std::string::npos) { std::vector<std::string> paths; - cmSystemTools::ExpandListArgument(e.Value, paths); + cmExpandList(e.Value, paths); const char* sep = ""; e.Value = ""; for (std::string& i : paths) { @@ -615,7 +615,7 @@ void cmCacheManager::CacheIterator::SetValue(const char* value) bool cmCacheManager::CacheIterator::GetValueAsBool() const { - return cmSystemTools::IsOn(this->GetEntry().Value); + return cmIsOn(this->GetEntry().Value); } std::vector<std::string> cmCacheManager::CacheEntry::GetPropertyList() const @@ -695,7 +695,7 @@ bool cmCacheManager::CacheIterator::GetPropertyAsBool( const std::string& prop) const { if (const char* value = this->GetProperty(prop)) { - return cmSystemTools::IsOn(value); + return cmIsOn(value); } return false; } |