kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: Add relative tag and add test for relative tag

Browse Source
This commit is contained in:
Andy Cedilnik 2006-03-21 16:03:19 -05:00
parent 9dbf4438dc
commit d41f97a5e6
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmFileCommand.cxx
View File

@ -210,6 +210,17 @@ bool cmFileCommand::HandleGlobCommand(std::vector<std::string> const& args,
bool first = true; bool first = true;
for ( ; i != args.end(); ++i ) for ( ; i != args.end(); ++i )
{ {
if ( *i == "RELATIVE" )
{
++i; // skip RELATIVE
if ( i == args.end() )
{
this->SetError("GLOB requires a directory after the RELATIVE tag");
return false;
}
g.SetRelative(i->c_str());
++i;
}
if ( !cmsys::SystemTools::FileIsFullPath(i->c_str()) ) if ( !cmsys::SystemTools::FileIsFullPath(i->c_str()) )
{ {
std::string expr = this->Makefile->GetCurrentDirectory(); std::string expr = this->Makefile->GetCurrentDirectory();

8
Source/cmFileCommand.h
View File

@ -67,8 +67,8 @@ public:
" FILE(WRITE filename \"message to write\"... )\n" " FILE(WRITE filename \"message to write\"... )\n"
" FILE(APPEND filename \"message to write\"... )\n" " FILE(APPEND filename \"message to write\"... )\n"
" FILE(READ filename variable)\n" " FILE(READ filename variable)\n"
" FILE(GLOB variable [globbing expressions]...)\n" " FILE(GLOB variable [RELATIVE path] [globbing expressions]...)\n"
" FILE(GLOB_RECURSE variable [globbing expressions]...)\n" " FILE(GLOB_RECURSE variable [RELATIVE path] [globbing expressions]...)\n"
" FILE(REMOVE [directory]...)\n" " FILE(REMOVE [directory]...)\n"
" FILE(REMOVE_RECURSE [directory]...)\n" " FILE(REMOVE_RECURSE [directory]...)\n"
" FILE(MAKE_DIRECTORY [directory]...)\n" " FILE(MAKE_DIRECTORY [directory]...)\n"
@ -87,7 +87,9 @@ public:
"variable.\n" "variable.\n"
"GLOB will generate a list of all files that match the globbing " "GLOB will generate a list of all files that match the globbing "
"expressions and store it into the variable. Globbing expressions " "expressions and store it into the variable. Globbing expressions "
"are similar to regular expressions, but much simpler.\n" "are similar to regular expressions, but much simpler. If RELATIVE "
"flag is specified for an expression, the results will be returned "
"as a relative path to the given path.\n"
"Examples of globbing expressions include:\n" "Examples of globbing expressions include:\n"
" *.cxx - match all files with extension cxx\n" " *.cxx - match all files with extension cxx\n"
" *.vt? - match all files with extension vta,...,vtz\n" " *.vt? - match all files with extension vta,...,vtz\n"

5
Tests/StringFileTest/CMakeLists.txt
View File

@ -91,9 +91,12 @@ SET(expr "${CMAKE_CURRENT_SOURCE_DIR}/[sS][!a-su-zA-Z0-9][^a-qs-zA-Z0-9]ing?ile*
MESSAGE("Glob expression is [${expr}].") MESSAGE("Glob expression is [${expr}].")
FILE(GLOB src_files "${expr}") FILE(GLOB src_files "${expr}")
MESSAGE("Globbed files [${src_files}].") MESSAGE("Globbed files [${src_files}].")
ADD_EXECUTABLE(StringFileTest ${src_files}) ADD_EXECUTABLE(StringFileTest ${src_files})
SET(expr "${CMAKE_CURRENT_SOURCE_DIR}/../*.cxx")
FILE(GLOB_RECURSE rel_src_files RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/.." "${expr}")
MESSAGE("Globbed files [${rel_src_files}].")
# Test FOREACH range # Test FOREACH range
MESSAGE("Cheack if FOREACH with RANGE works") MESSAGE("Cheack if FOREACH with RANGE works")
MACRO(TEST_RANGE ARGS CHECK) MACRO(TEST_RANGE ARGS CHECK)