[Cmake-commits] [cmake-commits] king committed cmCacheManager.cxx 1.110 1.111 cmCacheManager.h 1.53 1.54 cmake.cxx 1.411 1.412

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Mar 13 10:53:50 EDT 2009


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

Modified Files:
	cmCacheManager.cxx cmCacheManager.h cmake.cxx 
Log Message:
BUG: Fix cache properties for CMAKE_STRICT build

All cmPropertyMap instances must have CMakeInstance set.  This teaches
cmCacheManager to set it on cache entries.


Index: cmCacheManager.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCacheManager.cxx,v
retrieving revision 1.110
retrieving revision 1.111
diff -C 2 -d -r1.110 -r1.111
*** cmCacheManager.cxx	12 Mar 2009 17:11:48 -0000	1.110
--- cmCacheManager.cxx	13 Mar 2009 14:53:42 -0000	1.111
***************
*** 43,50 ****
  };
  
! cmCacheManager::cmCacheManager()
  {
    this->CacheMajorVersion = 0;
    this->CacheMinorVersion = 0;
  }
  
--- 43,51 ----
  };
  
! cmCacheManager::cmCacheManager(cmake* cm)
  {
    this->CacheMajorVersion = 0;
    this->CacheMinorVersion = 0;
+   this->CMakeInstance = cm;
  }
  
***************
*** 227,230 ****
--- 228,232 ----
      std::string helpString;
      CacheEntry e;
+     e.Properties.SetCMakeInstance(this->CMakeInstance);
      cmSystemTools::GetLineFromStream(fin, buffer);
      realbuffer = buffer.c_str();
***************
*** 385,388 ****
--- 387,391 ----
          // Create an entry and store the property.
          CacheEntry& ne = this->Cache[key];
+         ne.Properties.SetCMakeInstance(this->CMakeInstance);
          ne.Type = cmCacheManager::UNINITIALIZED;
          ne.SetProperty(*p, e.Value.c_str());
***************
*** 725,728 ****
--- 728,732 ----
  {
    CacheEntry& e = this->Cache[key];
+   e.Properties.SetCMakeInstance(this->CMakeInstance);
    if ( value )
      {

Index: cmCacheManager.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCacheManager.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -C 2 -d -r1.53 -r1.54
*** cmCacheManager.h	12 Mar 2009 14:49:05 -0000	1.53
--- cmCacheManager.h	13 Mar 2009 14:53:43 -0000	1.54
***************
*** 22,25 ****
--- 22,26 ----
  class cmMakefile;
  class cmMarkAsAdvancedCommand;
+ class cmake;
  
  /** \class cmCacheManager
***************
*** 32,36 ****
  {
  public:
!   cmCacheManager();
    class CacheIterator;
    friend class cmCacheManager::CacheIterator;
--- 33,37 ----
  {
  public:
!   cmCacheManager(cmake* cm);
    class CacheIterator;
    friend class cmCacheManager::CacheIterator;
***************
*** 176,179 ****
--- 177,181 ----
    unsigned int CacheMinorVersion;
  private:
+   cmake* CMakeInstance;
    typedef  std::map<cmStdString, CacheEntry> CacheEntryMap;
    static void OutputHelpString(std::ostream& fout,

Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.411
retrieving revision 1.412
diff -C 2 -d -r1.411 -r1.412
*** cmake.cxx	10 Mar 2009 15:11:15 -0000	1.411
--- cmake.cxx	13 Mar 2009 14:53:47 -0000	1.412
***************
*** 177,181 ****
    this->Verbose = false;
    this->InTryCompile = false;
!   this->CacheManager = new cmCacheManager;
    this->GlobalGenerator = 0;
    this->ProgressCallback = 0;
--- 177,181 ----
    this->Verbose = false;
    this->InTryCompile = false;
!   this->CacheManager = new cmCacheManager(this);
    this->GlobalGenerator = 0;
    this->ProgressCallback = 0;



More information about the Cmake-commits mailing list