Commit 2a731eae authored by David E. DeMarle's avatar David E. DeMarle

Don't expose VTK's two level glob and rename new macro.

It was decided that it should be up to the superproject decide what
paths to add.

Change-Id: I97cef1cd9abbcf8b0b9695a49c770f0efcf2da54
parent db504d1e
......@@ -120,12 +120,7 @@ macro(vtk_module_config ns)
unset(_${ns}_AUTOINIT)
endmacro()
# Call to add two level directory tree to search for modules under
macro(vtk_module_src_glob_path_add src bld)
list(APPEND vtk_module_src_glob_path "${src},${bld}")
endmacro()
# Call to add a single directory to the module search path
macro(vtk_module_src_path_add src bld)
list(APPEND vtk_module_src_path "${src},${bld}")
macro(vtk_add_to_module_search_path src bld)
list(APPEND vtk_module_search_path "${src},${bld}")
endmacro()
......@@ -492,21 +492,16 @@ endmacro()
macro(vtk_module_search) # [test-langs]
set(VTK_MODULES_ALL)
#go through all the glob dirs, and make modules of any ./*/*/module.cmakes found under them
foreach(pair ${vtk_module_src_glob_path})
string(REGEX MATCH "^([^,]*),([^,]*)$" m "${pair}")
set(src "${CMAKE_MATCH_1}")
set(bld "${CMAKE_MATCH_2}")
vtk_module_glob("${src}" "${bld}")
endforeach()
vtk_module_glob("${VTK_SOURCE_DIR}" "${VTK_BINARY_DIR}")
#go through all the direct dirs, and make modules of any ./module.cmakes found under them
foreach(pair ${vtk_module_src_path})
#go through any additional dirs, and make modules of any ./module.cmakes found under them
foreach(pair ${vtk_module_search_path})
string(REGEX MATCH "^([^,]*),([^,]*)$" m "${pair}")
set(src "${CMAKE_MATCH_1}")
set(bld "${CMAKE_MATCH_2}")
vtk_add_module("${src}" module.cmake "${bld}")
endforeach()
endmacro()
macro(vtk_add_test_module _lang)
......
......@@ -18,8 +18,6 @@ endif()
# Load the module DAG.
# Assess modules, and tests in the repository.
#vtk_module_glob("${VTK_SOURCE_DIR}" "${VTK_BINARY_DIR}" ${_test_languages})
vtk_module_src_glob_path_add("${VTK_SOURCE_DIR}" "${VTK_BINARY_DIR}")
vtk_module_search(${_test_languages})
# Now include the module group logic.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment