Commit 36b4fbb1 authored by Ken Martin's avatar Ken Martin
Browse files

added ability to load another cache

parent cdffbea0
......@@ -89,6 +89,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";
......@@ -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
{
......
......@@ -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*);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment