Commit 7db1741b authored by David Gobbi's avatar David Gobbi Committed by Code Review
Browse files

Merge topic 'wrap-include-dirs' into master

7b1219b9 COMP: Wrapper tools need full complement of include directories.
parents 3b1be340 7b1219b9
......@@ -84,6 +84,8 @@ macro(vtk_module_impl)
vtk_module_config(_dep ${VTK_MODULE_${vtk-module}_DEPENDS})
if(_dep_INCLUDE_DIRS)
include_directories(${_dep_INCLUDE_DIRS})
# This variable is used in vtkWrapping.cmake
set(${vtk-module}_DEPENDS_INCLUDE_DIRS ${_dep_INCLUDE_DIRS})
endif()
if(_dep_LIBRARY_DIRS)
link_directories(${_dep_LIBRARY_DIRS})
......
......@@ -24,15 +24,6 @@ function(vtk_add_tcl_wrapping module_name module_srcs)
string(REGEX REPLACE "^vtk" "" kit_name "${module_name}")
set(KIT ${kit_name})
# Set up the include directories for the wrapping
set(VTK_WRAP_INCLUDE_DIRS
${vtkCommonCore_SOURCE_DIR}
${vtkCommonCore_BINARY_DIR}
${VTK_SOURCE_DIR}/Utilities
${VTK_BINARY_DIR}/Utilities
${${vtk-module}_SOURCE_DIR}
)
# FIXME: Terrible temporary hack - add in the extra source file for CommonCore
if(${module_name} STREQUAL "vtkCommonCore")
set(extra_srcs ${VTK_SOURCE_DIR}/Wrapping/vtkTclUtil.cxx)
......@@ -51,7 +42,6 @@ function(vtk_add_tcl_wrapping module_name module_srcs)
set(dep "vtkRenderingContextIID")
endif()
list(APPEND extra_links ${dep}TCL)
list(APPEND VTK_WRAP_INCLUDE_DIRS ${${dep}_SOURCE_DIR})
endif()
endif()
endforeach()
......
......@@ -37,16 +37,19 @@ function(vtk_add_wrapping module_name module_srcs)
set_property(GLOBAL APPEND PROPERTY VTK_JAVA_WRAPPED ${module_name})
endif()
if(_wrap_module)
# The module is wrapped by at least one language - invoke wrap hierarchy.
# Set up the include directories for the wrapping
set(VTK_WRAP_INCLUDE_DIRS
${vtkCommonCore_SOURCE_DIR}
${vtkCommonCore_BINARY_DIR}
${VTK_SOURCE_DIR}/Utilities
${VTK_BINARY_DIR}/Utilities
${${vtk-module}_SOURCE_DIR}
)
# The list of include dirs to pass to wrapper tool command lines
set(VTK_WRAP_INCLUDE_DIRS)
if(${vtk-module}_DEPENDS_INCLUDE_DIRS)
list(APPEND VTK_WRAP_INCLUDE_DIRS ${${vtk-module}_DEPENDS_INCLUDE_DIRS})
endif()
if(${vtk-module}_INCLUDE_DIRS)
list(APPEND VTK_WRAP_INCLUDE_DIRS ${${vtk-module}_INCLUDE_DIRS})
endif()
if(${vtk-module}_SYSTEM_INCLUDE_DIRS)
list(APPEND VTK_WRAP_INCLUDE_DIRS ${${vtk-module}_SYSTEM_INCLUDE_DIRS})
endif()
# The module is wrapped by at least one language - invoke wrap hierarchy.
vtk_wrap_hierarchy(${module_name}Hierarchy ${CMAKE_CURRENT_BINARY_DIR}
"${module_srcs}")
......
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