FIX: only clear the cache on a load when the load needs to read internal values. Otherwise, it is assumed that we are reading another projects cache.
This commit is contained in:
parent
ad2247244d
commit
4d2e6c8394
@ -97,8 +97,11 @@ bool cmCacheManager::LoadCache(const char* path,
|
|||||||
{
|
{
|
||||||
std::string cacheFile = path;
|
std::string cacheFile = path;
|
||||||
cacheFile += "/CMakeCache.txt";
|
cacheFile += "/CMakeCache.txt";
|
||||||
// clear the old cache
|
// clear the old cache, if we are reading in internal values
|
||||||
|
if ( internal )
|
||||||
|
{
|
||||||
m_Cache.clear();
|
m_Cache.clear();
|
||||||
|
}
|
||||||
std::ifstream fin(cacheFile.c_str());
|
std::ifstream fin(cacheFile.c_str());
|
||||||
if(!fin)
|
if(!fin)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user