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

ExternalData: Parameterize internal file(GLOB) operation selection

Browse Source 
Extend the _ExternalData_arg_find_files signature with an option to
specify the kind of file(GLOB) operation to be performed.  Set
CMP0009 to NEW so that GLOB_RECURSE does not follow symlinks.
This commit is contained in:
Brad King 2015-03-25 09:29:55 -04:00
parent 166e29e453
commit 564c07f7dd
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Modules/ExternalData.cmake
View File

@ -685,7 +685,8 @@ macro(_ExternalData_arg_associated)
# Find files named explicitly. # Find files named explicitly.
foreach(file ${associated_files}) foreach(file ${associated_files})
_ExternalData_exact_regex(file_regex "${file}") _ExternalData_exact_regex(file_regex "${file}")
_ExternalData_arg_find_files("${reldir}${file}" "${reldir_regex}${file_regex}") _ExternalData_arg_find_files(GLOB "${reldir}${file}"
"${reldir_regex}${file_regex}")
endforeach() endforeach()
# Find files matching the given regular expressions. # Find files matching the given regular expressions.
@ -695,13 +696,13 @@ macro(_ExternalData_arg_associated)
set(all "${all}${sep}${reldir_regex}${regex}") set(all "${all}${sep}${reldir_regex}${regex}")
set(sep "|") set(sep "|")
endforeach() endforeach()
_ExternalData_arg_find_files("${reldir}" "${all}") _ExternalData_arg_find_files(GLOB "${reldir}" "${all}")
endmacro() endmacro()
macro(_ExternalData_arg_single) macro(_ExternalData_arg_single)
# Match only the named data by itself. # Match only the named data by itself.
_ExternalData_exact_regex(data_regex "${reldata}") _ExternalData_exact_regex(data_regex "${reldata}")
_ExternalData_arg_find_files("${reldata}" "${data_regex}") _ExternalData_arg_find_files(GLOB "${reldata}" "${data_regex}")
endmacro() endmacro()
macro(_ExternalData_arg_series) macro(_ExternalData_arg_series)
@ -756,12 +757,15 @@ macro(_ExternalData_arg_series)
# Then match base, number, and extension. # Then match base, number, and extension.
_ExternalData_exact_regex(series_base "${relbase}") _ExternalData_exact_regex(series_base "${relbase}")
_ExternalData_exact_regex(series_ext "${ext}") _ExternalData_exact_regex(series_ext "${ext}")
_ExternalData_arg_find_files("${relbase}*${ext}" _ExternalData_arg_find_files(GLOB "${relbase}*${ext}"
"${series_base}${series_match}${series_ext}") "${series_base}${series_match}${series_ext}")
endmacro() endmacro()
function(_ExternalData_arg_find_files pattern regex) function(_ExternalData_arg_find_files glob pattern regex)
file(GLOB globbed RELATIVE "${top_src}" "${top_src}/${pattern}*") cmake_policy(PUSH)
cmake_policy(SET CMP0009 NEW)
file(${glob} globbed RELATIVE "${top_src}" "${top_src}/${pattern}*")
cmake_policy(POP)
foreach(entry IN LISTS globbed) foreach(entry IN LISTS globbed)
if("x${entry}" MATCHES "^x(.*)(\\.(${_ExternalData_REGEX_EXT}))$") if("x${entry}" MATCHES "^x(.*)(\\.(${_ExternalData_REGEX_EXT}))$")
set(relname "${CMAKE_MATCH_1}") set(relname "${CMAKE_MATCH_1}")