summaryrefslogtreecommitdiffstats
path: root/Source/cmCacheManager.cxx
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2001-11-01 23:36:56 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2001-11-01 23:36:56 (GMT)
commita13cb203ad1e12850bc0ee2df6fd61b5f813543c (patch)
treee642d34681fd1fc5d8baa86309a98247f9f32192 /Source/cmCacheManager.cxx
parent4e6a9a4357c0a7b3bdb4d3c93af77cdd1840d49b (diff)
downloadCMake-a13cb203ad1e12850bc0ee2df6fd61b5f813543c.zip
CMake-a13cb203ad1e12850bc0ee2df6fd61b5f813543c.tar.gz
CMake-a13cb203ad1e12850bc0ee2df6fd61b5f813543c.tar.bz2
BUG: use collapse full path when testing cache directory
Diffstat (limited to 'Source/cmCacheManager.cxx')
-rw-r--r--Source/cmCacheManager.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
index faf5059..3d8110a 100644
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@@ -263,8 +263,9 @@ bool cmCacheManager::LoadCache(const char* path,
oldcwd[0] = oldcwd[0] - 'A' + 'a';
}
cmSystemTools::ConvertToUnixSlashes(currentcwd);
- if(oldcwd != currentcwd)
- {
+ if(cmSystemTools::CollapseFullPath(oldcwd.c_str())
+ != cmSystemTools::CollapseFullPath(currentcwd.c_str()))
+ {
std::string message =
std::string("The current CMakeCache.txt directory ") +
currentcwd + std::string(" is different than the directory ") +