Commit f0929383 authored by Ben Boeckel's avatar Ben Boeckel Committed by Code Review

Merge topic 'filters-python-wrap-exclude' into master

b1b31c94 java: get the list of java modules properly
0cf88894 vtkFiltersPython: exclude from Java and Tcl wrapping
ba551468 wrapping: add variables to exclude from language-specific wrapping
parents ff079101 b1b31c94
......@@ -63,6 +63,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_\([A-Z]+\)_WRAPPING$")
set(_doing "")
set(${vtk-module}_EXCLUDE_FROM_${CMAKE_MATCH_1}_WRAPPING 1)
elseif("${arg}" MATCHES "^EXCLUDE_FROM_WRAP_HIERARCHY$")
set(_doing "")
set(${vtk-module}_EXCLUDE_FROM_WRAP_HIERARCHY 1)
......
......@@ -54,15 +54,15 @@ function(vtk_add_wrapping module_name module_srcs module_hdrs)
endif()
# Now to wrap the languages that are on.
if(VTK_WRAP_PYTHON AND ${module_name}_WRAP_PYTHON)
if(VTK_WRAP_PYTHON AND ${module_name}_WRAP_PYTHON AND NOT ${module_name}_EXCLUDE_FROM_PYTHON_WRAPPING)
# Note that the module should be Python wrapped.
set_property(GLOBAL APPEND PROPERTY VTK_PYTHON_WRAPPED ${module_name})
endif()
if(VTK_WRAP_TCL)
if(VTK_WRAP_TCL AND NOT ${module_name}_EXCLUDE_FROM_TCL_WRAPPING)
set_property(GLOBAL APPEND PROPERTY VTK_TCL_WRAPPED ${module_name})
vtk_add_tcl_wrapping(${module_name} "${module_srcs}" "${module_hdrs}")
endif()
if(VTK_WRAP_JAVA)
if(VTK_WRAP_JAVA AND NOT ${module_name}_EXCLUDE_FROM_JAVA_WRAPPING)
set_property(GLOBAL APPEND PROPERTY VTK_JAVA_WRAPPED ${module_name})
vtk_add_java_wrapping(${module_name} "${module_srcs}" "${module_hdrs}")
endif()
......
......@@ -7,5 +7,7 @@ if (VTK_WRAP_PYTHON)
vtkPython
PRIVATE_DEPENDS
vtkWrappingPythonCore
EXCLUDE_FROM_TCL_WRAPPING
EXCLUDE_FROM_JAVA_WRAPPING
)
endif ()
......@@ -77,7 +77,8 @@ if(APPLE)
set(JAVAC_OPTIONS -J-Xmx512m)
endif()
foreach(module ${VTK_MODULES_ENABLED})
get_property(java_modules GLOBAL PROPERTY VTK_JAVA_WRAPPED)
foreach(module IN LISTS java_modules)
if(NOT ${module}_EXCLUDE_FROM_WRAPPING)
include(${${module}_BINARY_DIR}/JavaDependencies.cmake OPTIONAL)
list(APPEND _MODULES_TO_WRAP ${module})
......
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