Răsfoiți Sursa

Remove barely-used cmCacheManager::AddCacheEntry

The commit "Remove barely-used cmMakefile::AddCacheDefinition" removed
all but one use of the cmCacheManager method 'bool' overload.  This
commit removes the other use and the entire method, thus reducing code
duplication.
Brad King 16 ani în urmă
părinte
comite
74b79d3b39
3 a modificat fișierele cu 3 adăugiri și 18 ștergeri
  1. 0 13
      Source/cmCacheManager.cxx
  2. 0 3
      Source/cmCacheManager.h
  3. 3 2
      Source/cmake.cxx

+ 0 - 13
Source/cmCacheManager.cxx

@@ -766,19 +766,6 @@ void cmCacheManager::AddCacheEntry(const char* key,
   this->Cache[key] = e;
 }
 
-void cmCacheManager::AddCacheEntry(const char* key, bool v,
-                                   const char* helpString)
-{
-  if(v)
-    {
-    this->AddCacheEntry(key, "ON", helpString, cmCacheManager::BOOL);
-    }
-  else
-    {
-    this->AddCacheEntry(key, "OFF", helpString, cmCacheManager::BOOL);
-    }
-}
-
 bool cmCacheManager::CacheIterator::IsAtEnd() const
 {
   return this->Position == this->Container.Cache.end();

+ 0 - 3
Source/cmCacheManager.h

@@ -164,9 +164,6 @@ protected:
   void AddCacheEntry(const char* key, const char* value, 
                      const char* helpString, CacheEntryType type);
 
-  ///! Add a BOOL entry into the cache
-  void AddCacheEntry(const char* key, bool, const char* helpString);
-
   ///! Get a cache entry object for a key
   CacheEntry *GetCacheEntry(const char *key);
   ///! Clean out the CMakeFiles directory if no CMakeCache.txt

+ 3 - 2
Source/cmake.cxx

@@ -2153,8 +2153,9 @@ int cmake::ActualConfigure()
   if(!this->CacheManager->GetCacheValue("CMAKE_USE_RELATIVE_PATHS"))
     {
     this->CacheManager->AddCacheEntry
-      ("CMAKE_USE_RELATIVE_PATHS", false,
-       "If true, cmake will use relative paths in makefiles and projects.");
+      ("CMAKE_USE_RELATIVE_PATHS", "OFF",
+       "If true, cmake will use relative paths in makefiles and projects.",
+       cmCacheManager::BOOL);
     cmCacheManager::CacheIterator it =
       this->CacheManager->GetCacheIterator("CMAKE_USE_RELATIVE_PATHS");
     if ( !it.PropertyExists("ADVANCED") )