diff options
| author | Brad King <brad.king@kitware.com> | 2013-04-16 13:37:37 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-04-16 13:37:37 (GMT) |
| commit | 7d1590e6f98a48d1d4f8f95413710e37f01b6026 (patch) | |
| tree | 89cc1f3d55aee8d32f0d6960654a019b3d3df49b /Source | |
| parent | ec1ba9b0ae27a5731b98fecab648fa3edcfcffa2 (diff) | |
| download | CMake-7d1590e6f98a48d1d4f8f95413710e37f01b6026.zip CMake-7d1590e6f98a48d1d4f8f95413710e37f01b6026.tar.gz CMake-7d1590e6f98a48d1d4f8f95413710e37f01b6026.tar.bz2 | |
get_filename_component: Add DIRECTORY option (#14091)
The name "PATH" is not precise so add equivalent option "DIRECTORY".
Document the latter as preferred and the former as a legacy alias.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGetFilenameComponentCommand.cxx | 2 | ||||
| -rw-r--r-- | Source/cmGetFilenameComponentCommand.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmGetFilenameComponentCommand.cxx b/Source/cmGetFilenameComponentCommand.cxx index fd1ad60..1d7fefc 100644 --- a/Source/cmGetFilenameComponentCommand.cxx +++ b/Source/cmGetFilenameComponentCommand.cxx @@ -58,7 +58,7 @@ bool cmGetFilenameComponentCommand } std::string storeArgs; std::string programArgs; - if (args[2] == "PATH") + if (args[2] == "DIRECTORY" || args[2] == "PATH") { result = cmSystemTools::GetFilenamePath(filename); } diff --git a/Source/cmGetFilenameComponentCommand.h b/Source/cmGetFilenameComponentCommand.h index f294daa..09af332 100644 --- a/Source/cmGetFilenameComponentCommand.h +++ b/Source/cmGetFilenameComponentCommand.h @@ -64,12 +64,13 @@ public: return " get_filename_component(<VAR> <FileName> <COMP> [CACHE])\n" "Set <VAR> to a component of <FileName>, where <COMP> is one of:\n" - " PATH = Directory without file name\n" + " DIRECTORY = Directory without file name\n" " NAME = File name without directory\n" " EXT = File name longest extension (.b.c from d/a.b.c)\n" " NAME_WE = File name without directory or longest extension\n" " ABSOLUTE = Full path to file\n" " REALPATH = Full path to existing file with symlinks resolved\n" + " PATH = Legacy alias for DIRECTORY (use for CMake <= 2.8.11)\n" "Paths are returned with forward slashes and have no trailing slahes. " "The longest file extension is always considered. " "If the optional CACHE argument is specified, the result variable is " |