summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2009-01-29 16:39:03 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2009-01-29 16:39:03 (GMT)
commit33c296a44e31f700d5cfad40157469b36a10c6e9 (patch)
tree25adf5788b959b4f84754fa0e74a079dec32db5a
parent56ea0ad18688c32c35e2b5be15ca9958c579a67f (diff)
downloadCMake-33c296a44e31f700d5cfad40157469b36a10c6e9.zip
CMake-33c296a44e31f700d5cfad40157469b36a10c6e9.tar.gz
CMake-33c296a44e31f700d5cfad40157469b36a10c6e9.tar.bz2
BUG: fix for #8423
-rw-r--r--Source/cmGetFilenameComponentCommand.cxx3
-rw-r--r--Tests/CMakeTests/CMakeLists.txt1
2 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmGetFilenameComponentCommand.cxx b/Source/cmGetFilenameComponentCommand.cxx
index d06efe8..81d019b 100644
--- a/Source/cmGetFilenameComponentCommand.cxx
+++ b/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
{
diff --git a/Tests/CMakeTests/CMakeLists.txt b/Tests/CMakeTests/CMakeLists.txt
index 9f91abc..981653d 100644
--- a/Tests/CMakeTests/CMakeLists.txt
+++ b/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}"