mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-03 12:49:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'improve-get_filename_component-names'

Browse Source 
7d1590e get_filename_component: Add DIRECTORY option (#14091)
ec1ba9b get_filename_component: Add explicit unit tests
This commit is contained in:
Brad King
2013-05-16 14:36:49 -04:00
committed by CMake Topic Stage
parent 3a0014a1fe 7d1590e6f9
commit 7a198773f3
15 changed files with 50 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmGetFilenameComponentCommand.cxx
+1 -1
View File
@@ -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);
}
Source/cmGetFilenameComponentCommand.h
+2 -1
View File
@@ -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 "