Commit 43b0d1c7 authored by Dave DeMarle's avatar Dave DeMarle Committed by Code Review
Browse files

Merge topic 'modularize-visitbridge' into master

90324339 modules that don't make hierarchy should not depend on it
6d30d23b resolve merge conflicts
5f515f7f Allow modules to not participate in hierarchy wrapping.
parents 591ec3d9 90324339
......@@ -33,7 +33,9 @@ function(vtk_add_java_wrapping module_name module_srcs module_hdrs)
include_directories(${_java_include_dirs})
endif()
set(KIT_HIERARCHY_FILE ${CMAKE_CURRENT_BINARY_DIR}/${module_name}Hierarchy.txt)
if(NOT ${module_name}_EXCLUDE_FROM_WRAP_HIERARCHY)
set(KIT_HIERARCHY_FILE ${CMAKE_CURRENT_BINARY_DIR}/${module_name}Hierarchy.txt)
endif()
vtk_wrap_java3(${module_name}Java ModuleJava_SRCS
"${module_srcs};${Kit_JAVA_EXTRA_WRAP_SRCS}")
......
......@@ -23,6 +23,7 @@ macro(vtk_module _name)
set(${vtk-module}_DESCRIPTION "description")
set(${vtk-module}_EXCLUDE_FROM_ALL 0)
set(${vtk-module}_EXCLUDE_FROM_WRAPPING 0)
set(${vtk-module}_EXCLUDE_FROM_WRAP_HIERARCHY 0)
foreach(arg ${ARGN})
if("${arg}" MATCHES "^((|COMPILE_|TEST_|)DEPENDS|DESCRIPTION|IMPLEMENTS|DEFAULT|GROUPS)$")
set(_doing "${arg}")
......@@ -32,6 +33,9 @@ macro(vtk_module _name)
elseif("${arg}" MATCHES "^EXCLUDE_FROM_WRAPPING$")
set(_doing "")
set(${vtk-module}_EXCLUDE_FROM_WRAPPING 1)
elseif("${arg}" MATCHES "^EXCLUDE_FROM_WRAP_HIERARCHY$")
set(_doing "")
set(${vtk-module}_EXCLUDE_FROM_WRAP_HIERARCHY 1)
elseif("${arg}" MATCHES "^[A-Z][A-Z][A-Z]$" AND
NOT "${arg}" MATCHES "^(ON|OFF|MPI)$")
set(_doing "")
......
......@@ -15,7 +15,10 @@ function(vtk_add_python_wrapping module_name module_srcs module_hdrs)
include_directories(${_python_include_dirs})
endif()
set(KIT_HIERARCHY_FILE ${CMAKE_CURRENT_BINARY_DIR}/${module_name}Hierarchy.txt)
if(NOT ${module_name}_EXCLUDE_FROM_WRAP_HIERARCHY)
set(KIT_HIERARCHY_FILE ${CMAKE_CURRENT_BINARY_DIR}/${module_name}Hierarchy.txt)
endif()
string(REGEX REPLACE "^vtk" "" kit_name "${module_name}")
set(KIT ${kit_name})
set(XY ${PYTHON_MAJOR_VERSION}${PYTHON_MINOR_VERSION})
......
......@@ -20,7 +20,10 @@ function(vtk_add_tcl_wrapping module_name module_srcs module_hdrs)
endif()
# FIXME: These must be here for now, should be fixed in the wrap hierarchy stuff
set(KIT_HIERARCHY_FILE ${CMAKE_CURRENT_BINARY_DIR}/${module_name}Hierarchy.txt)
if(NOT ${module_name}_EXCLUDE_FROM_WRAP_HIERARCHY)
set(KIT_HIERARCHY_FILE ${CMAKE_CURRENT_BINARY_DIR}/${module_name}Hierarchy.txt)
endif()
string(REGEX REPLACE "^vtk" "" kit_name "${module_name}")
set(KIT ${kit_name})
......
......@@ -50,9 +50,11 @@ function(vtk_add_wrapping module_name module_srcs module_hdrs)
endif()
# The module is wrapped by at least one language - invoke wrap hierarchy.
set(_all_files ${module_srcs} ${modules_hdrs})
vtk_wrap_hierarchy(${module_name}Hierarchy ${CMAKE_CURRENT_BINARY_DIR}
"${_all_files}")
if(NOT ${module_name}_EXCLUDE_FROM_WRAP_HIERARCHY)
set(_all_files ${module_srcs} ${modules_hdrs})
vtk_wrap_hierarchy(${module_name}Hierarchy ${CMAKE_CURRENT_BINARY_DIR}
"${_all_files}")
endif()
# Now to wrap the languages that are on.
if(VTK_WRAP_PYTHON)
......
Supports Markdown
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