Commit ed4aa3dd authored by Robert Maynard's avatar Robert Maynard
Browse files

Remove the CMAKE_HAS_TARGET_INCLUDES as it always true now.

parent eb45626d
......@@ -29,10 +29,6 @@ function(vtk_add_java_wrapping module_name module_srcs module_hdrs)
${JAVA_INCLUDE_PATH}
${JAVA_INCLUDE_PATH2})
if(NOT CMAKE_HAS_TARGET_INCLUDES)
include_directories(${_java_include_dirs})
endif()
if(NOT ${module_name}_EXCLUDE_FROM_WRAP_HIERARCHY)
set(KIT_HIERARCHY_FILE ${${module_name}_WRAP_HIERARCHY_FILE})
endif()
......@@ -45,10 +41,8 @@ function(vtk_add_java_wrapping module_name module_srcs module_hdrs)
set_target_properties(${module_name}Java PROPERTIES PREFIX "")
endif()
vtk_target_export(${module_name}Java)
if(CMAKE_HAS_TARGET_INCLUDES)
set_property(TARGET ${module_name}Java APPEND
PROPERTY INCLUDE_DIRECTORIES ${_java_include_dirs})
endif()
set_property(TARGET ${module_name}Java APPEND
PROPERTY INCLUDE_DIRECTORIES ${_java_include_dirs})
# Force JavaClasses to build in the right order by adding a depenency.
add_dependencies(${module_name}JavaJavaClasses ${module_name}Java)
if(${module_name}_IMPLEMENTS)
......
......@@ -83,10 +83,6 @@ function(vtk_add_python_wrapping_library module srcs)
${PYTHON_INCLUDE_DIRS})
set(XY ${PYTHON_MAJOR_VERSION}${PYTHON_MINOR_VERSION})
if(NOT CMAKE_HAS_TARGET_INCLUDES)
include_directories(${_python_include_dirs})
endif()
# Figure out the dependent PythonXYD libraries for the module
set(extra_links)
string(REPLACE "Kit" "" kit_basename "${module}")
......@@ -115,10 +111,8 @@ function(vtk_add_python_wrapping_library module srcs)
get_property(output_name TARGET ${module}PythonD PROPERTY OUTPUT_NAME)
string(REPLACE "PythonD" "Python${XY}D" output_name "${output_name}")
set_property(TARGET ${module}PythonD PROPERTY OUTPUT_NAME ${output_name})
if(CMAKE_HAS_TARGET_INCLUDES)
set_property(TARGET ${module}PythonD APPEND
PROPERTY INCLUDE_DIRECTORIES ${_python_include_dirs})
endif()
set_property(TARGET ${module}PythonD APPEND
PROPERTY INCLUDE_DIRECTORIES ${_python_include_dirs})
target_link_libraries(${module}PythonD LINK_PUBLIC
vtkWrappingPythonCore ${extra_links} ${VTK_PYTHON_LIBRARIES})
......@@ -141,10 +135,8 @@ function(vtk_add_python_wrapping_library module srcs)
endif()
_vtk_add_python_module(${module}Python ${prefix}PythonInit.cxx)
target_link_libraries(${module}Python ${module}PythonD)
if(CMAKE_HAS_TARGET_INCLUDES)
set_property(TARGET ${module}Python APPEND
PROPERTY INCLUDE_DIRECTORIES ${_python_include_dirs})
endif()
set_property(TARGET ${module}Python APPEND
PROPERTY INCLUDE_DIRECTORIES ${_python_include_dirs})
endfunction()
#------------------------------------------------------------------------------
......
......@@ -20,9 +20,6 @@ function(vtk_add_tcl_wrapping module_name module_srcs module_hdrs)
${VTK_BINARY_DIR}/Wrapping/Tcl
${TCL_INCLUDE_PATH})
if(NOT CMAKE_HAS_TARGET_INCLUDES)
include_directories(${_tcl_include_dirs})
endif()
# FIXME: These must be here for now, should be fixed in the wrap hierarchy stuff
if(NOT ${module_name}_EXCLUDE_FROM_WRAP_HIERARCHY)
......@@ -55,10 +52,8 @@ function(vtk_add_tcl_wrapping module_name module_srcs module_hdrs)
set(tcl_module ${${module_name}_TCL_NAME})
vtk_wrap_tcl3(${tcl_module}TCL Tcl_SRCS "${module_srcs}" "")
vtk_add_library(${tcl_module}TCL ${Tcl_SRCS} ${extra_srcs})
if(CMAKE_HAS_TARGET_INCLUDES)
set_property(TARGET ${tcl_module}TCL APPEND
PROPERTY INCLUDE_DIRECTORIES ${_tcl_include_dirs})
endif()
set_property(TARGET ${tcl_module}TCL APPEND
PROPERTY INCLUDE_DIRECTORIES ${_tcl_include_dirs})
if(${module_name}_IMPLEMENTS)
set_property(TARGET ${tcl_module}TCL PROPERTY COMPILE_DEFINITIONS
"${module_name}_AUTOINIT=1(${module_name})")
......
......@@ -15,10 +15,6 @@ endif()
include(vtkWrapHierarchy)
if(${CMAKE_VERSION} VERSION_GREATER 2.8.7.20120314)
set(CMAKE_HAS_TARGET_INCLUDES TRUE)
endif()
# This is the main function, always called from the vtk_module_library function
# when a new module library is added.
function(vtk_add_wrapping module_name module_srcs module_hdrs)
......
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