diff options
| -rw-r--r-- | Source/cmCacheManager.cxx | 2 | ||||
| -rw-r--r-- | Source/cmake.cxx | 14 | ||||
| -rw-r--r-- | Source/cmake.h | 8 |
3 files changed, 13 insertions, 11 deletions
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx index d6794aa..3967592 100644 --- a/Source/cmCacheManager.cxx +++ b/Source/cmCacheManager.cxx @@ -439,7 +439,7 @@ bool cmCacheManager::SaveCache(const char* path) { const CacheEntry& ce = (*i).second; CacheEntryType t = ce.Type; - if(t == cmCacheManager::UNINITIALIZED || !ce.Initialized) + if(!ce.Initialized) { /* // This should be added in, but is not for now. diff --git a/Source/cmake.cxx b/Source/cmake.cxx index aae773f..9082837 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -33,8 +33,10 @@ # include <cmsys/Terminal.h> #endif -# include <cmsys/Directory.hxx> +#include <cmsys/Directory.hxx> #include <cmsys/Process.h> +#include <cmsys/Glob.hxx> +#include <cmsys/RegularExpression.hxx> // only build kdevelop generator on non-windows platforms // when not bootstrapping cmake @@ -288,7 +290,7 @@ bool cmake::SetCacheArgs(const std::vector<std::string>& args) } else { - cmSystemTools::Error("-D must be followed with VAR=VALUE."); + cmSystemTools::Error("-D must be followed with VAR=VALUE."); return false; } } @@ -298,8 +300,7 @@ bool cmake::SetCacheArgs(const std::vector<std::string>& args) cmCacheManager::ParseEntry(entry.c_str(), var, value)) { this->CacheManager->AddCacheEntry(var.c_str(), value.c_str(), - "No help, variable specified on the command line.", - type==cmCacheManager::UNINITIALIZED?cmCacheManager::STRING:type); + "No help, variable specified on the command line.", type); } else { @@ -325,7 +326,8 @@ bool cmake::SetCacheArgs(const std::vector<std::string>& args) return false; } } - + cmsys::RegularExpression regex( + cmsys::Glob::PatternToRegex(entryPattern.c_str(), true).c_str()); //go through all cache entries and collect the vars which will be removed std::vector<std::string> entriesToDelete; cmCacheManager::CacheIterator it = @@ -336,7 +338,7 @@ bool cmake::SetCacheArgs(const std::vector<std::string>& args) if(t != cmCacheManager::STATIC && t != cmCacheManager::UNINITIALIZED) { std::string entryName = it.GetName(); - if (entryName.find(entryPattern) != std::string::npos) + if (regex.find(entryName.c_str())) { entriesToDelete.push_back(entryName); } diff --git a/Source/cmake.h b/Source/cmake.h index c148515..3e7b5fa 100644 --- a/Source/cmake.h +++ b/Source/cmake.h @@ -388,11 +388,11 @@ private: "for the project. This option may be used to specify a setting " \ "that takes priority over the project's default value. The option " \ "may be repeated for as many cache entries as desired."}, \ - {"-U <var>", "Remove one or more cmake cache entries.", \ + {"-U <globbing_expr>", "Remove matching entries from CMake cache.", \ "This option may be used to remove one or more variables from the " \ - "CMakeCache.txt file, so that CMake will search them again. All " \ - "variables which contain \"<var>\" will be removed. The option may be "\ - "repeated for as many cache entries as desired."}, \ + "CMakeCache.txt file, globbing expressions using * and ? are supported. "\ + "The option may be repeated for as many cache entries as desired.\n" \ + "Use with care, you can make your CMakeCache.txt non-working."}, \ {"-G <generator-name>", "Specify a makefile generator.", \ "CMake may support multiple native build systems on certain platforms. " \ "A makefile generator is responsible for generating a particular build " \ |