[Cmake-commits] [cmake-commits] king committed cmake.cxx 1.408 1.409 cmake.h 1.119 1.120

cmake-commits at cmake.org cmake-commits at cmake.org
Thu Mar 5 13:57:12 EST 2009


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

Modified Files:
	cmake.cxx cmake.h 
Log Message:
STYLE: Remove unused cmake::CacheVersionMatches

This remove the method completely since nothing uses it.


Index: cmake.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.h,v
retrieving revision 1.119
retrieving revision 1.120
diff -C 2 -d -r1.119 -r1.120
*** cmake.h	4 Mar 2009 20:39:27 -0000	1.119
--- cmake.h	5 Mar 2009 18:57:10 -0000	1.120
***************
*** 399,404 ****
    bool DoSuppressDevWarnings;
  
-   ///! return true if the same cmake was used to make the cache.
-   bool CacheVersionMatches();
    ///! read in a cmake list file to initialize the cache
    void ReadListFile(const char *path);
--- 399,402 ----

Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.408
retrieving revision 1.409
diff -C 2 -d -r1.408 -r1.409
*** cmake.cxx	4 Mar 2009 20:39:27 -0000	1.408
--- cmake.cxx	5 Mar 2009 18:57:10 -0000	1.409
***************
*** 2175,2198 ****
  }
  
- bool cmake::CacheVersionMatches()
- {
-   const char* majv = 
-     this->CacheManager->GetCacheValue("CMAKE_CACHE_MAJOR_VERSION");
-   const char* minv = 
-     this->CacheManager->GetCacheValue("CMAKE_CACHE_MINOR_VERSION");
-   const char* relv = 
-     this->CacheManager->GetCacheValue("CMAKE_CACHE_RELEASE_VERSION");
-   bool cacheSameCMake = false;
-   if(majv &&
-      atoi(majv) == static_cast<int>(cmVersion::GetMajorVersion())
-      && minv &&
-      atoi(minv) == static_cast<int>(cmVersion::GetMinorVersion())
-      && relv && (strcmp(relv, cmVersion::GetReleaseVersion().c_str()) == 0))
-     {
-     cacheSameCMake = true;
-     }
-   return cacheSameCMake;
- }
- 
  void cmake::PreLoadCMakeFiles()
  {
--- 2175,2178 ----



More information about the Cmake-commits mailing list