[Cmake-commits] [cmake-commits] king committed cmCacheManager.cxx 1.112 1.113 cmCacheManager.h 1.54 1.55 cmake.cxx 1.425 1.426

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv20785/Source

Modified Files:
	cmCacheManager.cxx cmCacheManager.h cmake.cxx 
Log Message:
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.


Index: cmCacheManager.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCacheManager.cxx,v
retrieving revision 1.112
retrieving revision 1.113
diff -C 2 -d -r1.112 -r1.113
*** cmCacheManager.cxx	13 Mar 2009 14:53:53 -0000	1.112
--- cmCacheManager.cxx	11 Sep 2009 14:04:06 -0000	1.113
***************
*** 767,783 ****
  }
  
- 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
  {
--- 767,770 ----

Index: cmCacheManager.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCacheManager.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -C 2 -d -r1.54 -r1.55
*** cmCacheManager.h	13 Mar 2009 14:53:43 -0000	1.54
--- cmCacheManager.h	11 Sep 2009 14:04:09 -0000	1.55
***************
*** 165,171 ****
                       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);
--- 165,168 ----

Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.425
retrieving revision 1.426
diff -C 2 -d -r1.425 -r1.426
*** cmake.cxx	4 Sep 2009 16:38:15 -0000	1.425
--- cmake.cxx	11 Sep 2009 14:04:10 -0000	1.426
***************
*** 2154,2159 ****
      {
      this->CacheManager->AddCacheEntry
!       ("CMAKE_USE_RELATIVE_PATHS", false,
!        "If true, cmake will use relative paths in makefiles and projects.");
      cmCacheManager::CacheIterator it =
        this->CacheManager->GetCacheIterator("CMAKE_USE_RELATIVE_PATHS");
--- 2154,2160 ----
      {
      this->CacheManager->AddCacheEntry
!       ("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");