Bill Hoffman преди 16 години
родител
ревизия
33c296a44e
променени са 2 файла, в които са добавени 3 реда и са изтрити 1 реда
  1. 2 1
      Source/cmGetFilenameComponentCommand.cxx
  2. 1 0
      Tests/CMakeTests/CMakeLists.txt

+ 2 - 1
Source/cmGetFilenameComponentCommand.cxx

@@ -91,7 +91,8 @@ bool cmGetFilenameComponentCommand
       }
 
     // Collapse the path to its simplest form.
-    result = cmSystemTools::CollapseFullPath(filename.c_str());
+    filename = cmSystemTools::CollapseFullPath(filename.c_str());
+    result   = cmSystemTools::GetRealPath(filename.c_str());
     }
   else 
     {

+ 1 - 0
Tests/CMakeTests/CMakeLists.txt

@@ -14,6 +14,7 @@ AddCMakeTest(VariableWatch "")
 AddCMakeTest(Include "")
 AddCMakeTest(FindBase "")
 AddCMakeTest(Toolchain "")
+AddCMakeTest(GetFilenameComponentSymlinks "")
 
 SET(GetPrerequisites_PreArgs
   "-DCTEST_CONFIGURATION_TYPE:STRING=\\\${CTEST_CONFIGURATION_TYPE}"