added ability to load another cache

2 files changed, 12 insertions, 2 deletions

diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index 7582f37..cbc72ef 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -90,6 +90,11 @@ bool cmCacheManager::LoadCache(cmMakefile* mf)
 
 bool cmCacheManager::LoadCache(const char* path)
 {
+  this->LoadCache(path,true);
+}
+bool cmCacheManager::LoadCache(const char* path,
+			       bool internal)
+{
   std::string cacheFile = path;
   cacheFile += "/CMakeCache.txt";
   // clear the old cache
@@ -125,8 +130,12 @@ bool cmCacheManager::LoadCache(const char* path)
     if(reg.find(buffer))
       {
       e.m_Type = cmCacheManager::StringToType(reg.match(2).c_str());
-      e.m_Value = reg.match(3);
-      m_Cache[reg.match(1)] = e;
+      // only load internal values if internal is set
+      if (internal || e.m_Type != INTERNAL)
+	{
+	  e.m_Value = reg.match(3);
+	  m_Cache[reg.match(1)] = e;
+	}
       }
     else
       {
diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h
index 6ecb37b..edb18a8 100644
--- a/Source/cmCacheManager.h
+++ b/Source/cmCacheManager.h
@@ -78,6 +78,7 @@ public:
   bool LoadCache(cmMakefile*); 
   //! Load a cache for given makefile.  Loads from path/CMakeCache.txt.
   bool LoadCache(const char* path);
+  bool LoadCache(const char* path, bool internal);
 
   //! Put cache definitions into makefile
   void DefineCache(cmMakefile*);