WIP: vtkglue: fix compilation and object factories with 8.90

mathstuf · May 16, 2019 · 63e26fa · mathstuf · May 16, 2019 · mathstuf
1 parent 0d55292
commit 63e26fa
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 15 deletions.
diff --git a/Modules/Bridge/VtkGlue/CMakeLists.txt b/Modules/Bridge/VtkGlue/CMakeLists.txt
@@ -5,14 +5,7 @@ endif()
 
 if(NOT COMMAND vtk_module_config)
   macro(vtk_module_config ns)
-     foreach(arg ${ARGN})
-      if(${arg} MATCHES "^[Vv][Tt][Kk]")
-        string(REGEX REPLACE "^[Vv][Tt][Kk]" "" _arg ${arg})
-      else()
-        set(_arg ${arg})
-      endif()
-      set(${ns}_LIBRARIES ${${ns}_LIBRARIES} VTK::${_arg})
-     endforeach()
+    list(APPEND ${ns}_LIBRARIES ${ARGN})
   endmacro()
 
   if(NOT VTK_RENDERING_BACKEND)

diff --git a/Modules/Bridge/VtkGlue/test/CMakeLists.txt b/Modules/Bridge/VtkGlue/test/CMakeLists.txt
@@ -19,11 +19,6 @@ if(NOT VTK_RENDERING_BACKEND STREQUAL "None")
 endif()
 
 CreateTestDriver(ITKVtkGlue "${ITKVtkGlue-Test_LIBRARIES}" "${ITKVtkGlueTests}")
-if(VTK_VERSION VERSION_GREATER_EQUAL "8.90.0")
-  vtk_module_autoinit(
-    TARGETS ITKVtkGlueTestDriver
-  MODULES ${VTK_LIBRARIES})
-endif()
 
 itk_add_test(
   NAME itkImageToVTKImageFilterTest

diff --git a/Modules/Segmentation/LevelSetsv4Visualization/CMakeLists.txt b/Modules/Segmentation/LevelSetsv4Visualization/CMakeLists.txt
@@ -132,4 +132,10 @@ project(ITKLevelSetsv4Visualization)
 # endif()
 # ")
 
+list(APPEND ITKLevelSetsv4Visualization_LIBRARIES
+  VTK::ImagingCore
+  VTK::IOImage
+  VTK::RenderingAnnotation
+  VTK::RenderingCore)
+
 itk_module_impl()
diff --git a/Modules/Segmentation/LevelSetsv4Visualization/itk-module.cmake b/Modules/Segmentation/LevelSetsv4Visualization/itk-module.cmake
@@ -4,8 +4,10 @@ visualization of the level-sets.")
 itk_module( ITKLevelSetsv4Visualization
   DEPENDS
     ITKLevelSetsv4
-    ITKVtkGlue
+    ITKVTK
+    ITKVtkGlue # Not necessary; `find_package(VTK)` needs done however
   TEST_DEPENDS
+    ITKVTK
     ITKTestKernel
   EXCLUDE_FROM_DEFAULT
   DESCRIPTION

diff --git a/Modules/Segmentation/LevelSetsv4Visualization/test/CMakeLists.txt b/Modules/Segmentation/LevelSetsv4Visualization/test/CMakeLists.txt
@@ -15,8 +15,15 @@ itkVTKVisualize3DWhitakerLevelSetTest
 itkVTKVisualize2DLevelSetAsElevationMapTest
 )
 
-set(ITKLevelSetsv4Visualization-Test_LIBRARIES ${ITKLevelSetsv4Visualization_LIBRARIES} )
+list(APPEND ITKLevelSetsv4Visualization-Test_LIBRARIES ${ITKLevelSetsv4Visualization_LIBRARIES} )
 CreateTestDriver(ITKLevelSetsv4Visualization  "${ITKLevelSetsv4Visualization-Test_LIBRARIES}" "${ITKLevelSetsv4VisualizationTests}")
+target_link_libraries(ITKLevelSetsv4VisualizationTestDriver
+  PRIVATE
+    VTK::InteractionStyle
+    VTK::RenderingOpenGL2)
+vtk_module_autoinit(
+  TARGETS ITKLevelSetsv4VisualizationTestDriver
+  MODULES VTK::RenderingOpenGL2)
 
 set(TEMP ${ITK_TEST_OUTPUT_DIR})