summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2009-02-06 13:33:52 (GMT)
committerBrad King <brad.king@kitware.com>2009-02-06 13:33:52 (GMT)
commit16fe328dfc65f47e0a4fd1f7f1ac8e2fa3663b51 (patch)
tree71d385a536394b58dc42b7e4162baf3078907097 /Source
parent0499ca66aab617409458cc2add56c10c15904e94 (diff)
downloadCMake-16fe328dfc65f47e0a4fd1f7f1ac8e2fa3663b51.zip
CMake-16fe328dfc65f47e0a4fd1f7f1ac8e2fa3663b51.tar.gz
CMake-16fe328dfc65f47e0a4fd1f7f1ac8e2fa3663b51.tar.bz2
BUG: Alternative fix to bug #8423
The patch used to fix this bug used SystemTools::GetRealPath which works only for existing files. It broke the case of using the command get_filename_component for a non-existing file. Also, it changed long-standing behavior in a possibly incompatible way even for existing files. This reverts the original fix and instead updates the documentation to be consistent with the behavior.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmGetFilenameComponentCommand.cxx3
-rw-r--r--Source/cmGetFilenameComponentCommand.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/Source/cmGetFilenameComponentCommand.cxx b/Source/cmGetFilenameComponentCommand.cxx
index 81d019b..d06efe8 100644
--- a/Source/cmGetFilenameComponentCommand.cxx
+++ b/Source/cmGetFilenameComponentCommand.cxx
@@ -91,8 +91,7 @@ bool cmGetFilenameComponentCommand
}
// Collapse the path to its simplest form.
- filename = cmSystemTools::CollapseFullPath(filename.c_str());
- result = cmSystemTools::GetRealPath(filename.c_str());
+ result = cmSystemTools::CollapseFullPath(filename.c_str());
}
else
{
diff --git a/Source/cmGetFilenameComponentCommand.h b/Source/cmGetFilenameComponentCommand.h
index 66e958f..e058e0b 100644
--- a/Source/cmGetFilenameComponentCommand.h
+++ b/Source/cmGetFilenameComponentCommand.h
@@ -72,7 +72,7 @@ public:
" [CACHE])\n"
"Set VarName to be the path (PATH), file name (NAME), file "
"extension (EXT), file name without extension (NAME_WE) of FileName, "
- "or the full absolute (ABSOLUTE) file name without symlinks. "
+ "or the full path (ABSOLUTE). "
"Note that the path is converted to Unix slashes format and has no "
"trailing slashes. The longest file extension is always considered. "
"If the optional CACHE argument is specified, the result variable is "