diff options
| author | Jim Miller <millerjv@crd.ge.com> | 2001-05-09 15:15:57 (GMT) |
|---|---|---|
| committer | Jim Miller <millerjv@crd.ge.com> | 2001-05-09 15:15:57 (GMT) |
| commit | 4d2e6c83941e8df02a96e6f45e292bca24015cb4 (patch) | |
| tree | 36524b9d662e1b1e5322ccffcdd20d4d077f07fb /Source/cmCacheManager.cxx | |
| parent | ad2247244de305ab3c8b102dba7643ea704756fa (diff) | |
| download | CMake-4d2e6c83941e8df02a96e6f45e292bca24015cb4.zip CMake-4d2e6c83941e8df02a96e6f45e292bca24015cb4.tar.gz CMake-4d2e6c83941e8df02a96e6f45e292bca24015cb4.tar.bz2 | |
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.
Diffstat (limited to 'Source/cmCacheManager.cxx')
| -rw-r--r-- | Source/cmCacheManager.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx index 818f260..224ca77 100644 --- a/Source/cmCacheManager.cxx +++ b/Source/cmCacheManager.cxx @@ -97,8 +97,11 @@ bool cmCacheManager::LoadCache(const char* path, { std::string cacheFile = path; cacheFile += "/CMakeCache.txt"; - // clear the old cache - m_Cache.clear(); + // clear the old cache, if we are reading in internal values + if ( internal ) + { + m_Cache.clear(); + } std::ifstream fin(cacheFile.c_str()); if(!fin) { |