Ver código fonte

BUG: use collapse full path when testing cache directory

Bill Hoffman 24 anos atrás
pai
commit
a13cb203ad
1 arquivos alterados com 3 adições e 2 exclusões
  1. 3 2
      Source/cmCacheManager.cxx

+ 3 - 2
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 ") +