@@ -118,7 +118,6 @@ macro(vtkMacroKitPythonWrap)
118
118
endif ()
119
119
# Default global variables
120
120
if (NOT DEFINED Slicer_VTK_WRAP_HIERARCHY_DIR)
121
- # set(Slicer_VTK_WRAP_HIERARCHY_DIR ${Slicer_BINARY_DIR})
122
121
set (Slicer_VTK_WRAP_HIERARCHY_DIR "${CMAKE_CURRENT_BINARY_DIR} " )
123
122
endif ()
124
123
if (NOT DEFINED Slicer_VTK_WRAP_MODULE_INSTALL_COMPONENT_IDENTIFIER)
@@ -135,7 +134,6 @@ macro(vtkMacroKitPythonWrap)
135
134
include (vtkWrapPython)
136
135
137
136
set (TMP_WRAP_FILES ${MY_KIT_SRCS} ${MY_KIT_WRAP_HEADERS} )
138
- set (_wrap_hierarchy_stamp_file)
139
137
140
138
# Create list of wrapping dependencies for generating the hierarchy file.
141
139
set (_kit_wrap_depends)
@@ -176,17 +174,13 @@ macro(vtkMacroKitPythonWrap)
176
174
list (APPEND VTK_WRAP_INCLUDE_DIRS ${_kit_wrap_include_dirs} )
177
175
178
176
# Generate hierarchy files for VTK8 and later
179
- if (NOT ${VTK_VERSION_MAJOR} VERSION_LESS 8)
180
177
include (vtkWrapHierarchy)
181
178
182
179
# Set variables for this and future runs of vtk_wrap_hierarchy:
183
180
# - <module_name>_WRAP_DEPENDS
184
181
# - <module_name>_WRAP_HIERARCHY_FILE
185
182
set (${MY_KIT_NAME} _WRAP_DEPENDS "${_kit_wrap_depends} " CACHE INTERNAL "${MY_KIT_NAME} wrapping dependencies" FORCE)
186
183
set (_wrap_hierarchy_file "${Slicer_VTK_WRAP_HIERARCHY_DIR} /${MY_KIT_NAME} Hierarchy.txt" )
187
- if (${VTK_VERSION_MAJOR} .${VTK_VERSION_MINOR} VERSION_LESS "8.2" )
188
- set (_wrap_hierarchy_stamp_file ${CMAKE_CURRENT_BINARY_DIR} /${MY_KIT_NAME} Hierarchy.stamp.txt)
189
- endif ()
190
184
set (${MY_KIT_NAME} _WRAP_HIERARCHY_FILE "${_wrap_hierarchy_file} " CACHE INTERNAL "${MY_KIT_NAME} wrap hierarchy file" FORCE)
191
185
192
186
set_property (GLOBAL APPEND PROPERTY ${Slicer_VTK_WRAP_HIERARCHY_TARGETS_PROPERTY_NAME} ${MY_KIT_NAME} )
@@ -197,7 +191,6 @@ macro(vtkMacroKitPythonWrap)
197
191
198
192
# Generate hierarchy files
199
193
vtk_wrap_hierarchy(${MY_KIT_NAME} ${Slicer_VTK_WRAP_HIERARCHY_DIR} "${TMP_WRAP_FILES} " )
200
- endif ()
201
194
202
195
VTK_WRAP_PYTHON3(${MY_KIT_NAME} Python KitPython_SRCS "${TMP_WRAP_FILES} " )
203
196
@@ -211,11 +204,7 @@ macro(vtkMacroKitPythonWrap)
211
204
# hierarchy file is created.
212
205
# XXX Use target_sources if cmake_minimum_required >= 3.1
213
206
get_target_property (_kit_srcs ${MY_KIT_NAME} SOURCES )
214
- if (${VTK_VERSION_MAJOR} .${VTK_VERSION_MINOR} VERSION_LESS "8.2" )
215
- list (APPEND _kit_srcs ${_wrap_hierarchy_stamp_file} )
216
- else ()
217
- list (APPEND _kit_srcs ${_wrap_hierarchy_file} )
218
- endif ()
207
+ list (APPEND _kit_srcs ${_wrap_hierarchy_file} )
219
208
set_target_properties (${MY_KIT_NAME} PROPERTIES SOURCES "${_kit_srcs} " )
220
209
221
210
set (VTK_KIT_PYTHON_LIBRARIES)
0 commit comments