diff --git a/CMakeLists.txt b/CMakeLists.txt index 24f4788..5ca12f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,6 +35,14 @@ set(_target_freetypeopengl) if(TARGET vtkRenderingFreeType${VTK_RENDERING_BACKEND}) set(_target_freetypeopengl vtkRenderingFreeType${VTK_RENDERING_BACKEND}) endif() +set(_rendering_modules ) +if(NOT VTK_RENDERING_BACKEND STREQUAL "None") + set(_rendering_modules + vtkRendering${VTK_RENDERING_BACKEND} + vtkInteractionStyle + vtkInteractionWidgets + ) +endif() if (${VTK_VERSION} VERSION_LESS ${VERSION_MIN}) message(ERROR " VtkGlue requires VTK version ${VERSION_MIN} or newer but the current version is ${VTK_VERSION}") @@ -47,11 +55,9 @@ else() set(_wrap_module vtkWrappingPythonCore) endif() vtk_module_config(ITKVtkGlue_VTK - vtkRendering${VTK_RENDERING_BACKEND} vtkRenderingFreeType ${_target_freetypeopengl} - vtkInteractionStyle - vtkInteractionWidgets + ${_rendering_modules} vtkIOImage vtkIOLegacy vtkImagingSources @@ -103,6 +109,13 @@ set(_target_freetypeopengl) if(TARGET vtkRenderingFreeType${VTK_RENDERING_BACKEND}) set(_target_freetypeopengl vtkRenderingFreeType${VTK_RENDERING_BACKEND}) endif() +if(NOT VTK_RENDERING_BACKEND STREQUAL \"None\") + set(_rendering_modules + vtkRendering${VTK_RENDERING_BACKEND} + vtkInteractionStyle + vtkInteractionWidgets + ) +endif() if( ${VTK_VERSION} VERSION_LESS 6.0.0 ) set(ITKVtkGlue_VTK_INCLUDE_DIRS ${VTK_INCLUDE_DIRS}) @@ -113,11 +126,9 @@ else() set(_wrap_module vtkWrappingPythonCore) endif() vtk_module_config(ITKVtkGlue_VTK - vtkRendering${VTK_RENDERING_BACKEND} vtkRenderingFreeType ${_target_freetypeopengl} - vtkInteractionStyle - vtkInteractionWidgets + ${_rendering_modules} vtkIOImage vtkIOLegacy vtkImagingSources @@ -146,6 +157,13 @@ if(NOT ITK_BINARY_DIR) if(TARGET vtkRenderingFreeType${VTK_RENDERING_BACKEND}) set(_target_freetypeopengl vtkRenderingFreeType${VTK_RENDERING_BACKEND}) endif() + if(NOT VTK_RENDERING_BACKEND STREQUAL \"None\") + set(_rendering_modules + vtkRendering${VTK_RENDERING_BACKEND} + vtkInteractionStyle + vtkInteractionWidgets + ) + endif() if( ${VTK_VERSION} VERSION_LESS 6.0.0 ) set(ITKVtkGlue_VTK_INCLUDE_DIRS ${VTK_INCLUDE_DIRS}) @@ -156,11 +174,9 @@ if(NOT ITK_BINARY_DIR) set(_wrap_module vtkWrappingPythonCore) endif() vtk_module_config(ITKVtkGlue_VTK - vtkRendering${VTK_RENDERING_BACKEND} vtkRenderingFreeType ${_target_freetypeopengl} - vtkInteractionStyle - vtkInteractionWidgets + ${_rendering_modules} vtkIOImage vtkIOLegacy vtkImagingSources diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3533b49..83c103b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,10 @@ set(ITKVtkGlue_SRCS itkVTKImageExportBase.cxx - QuickView.cxx ) +if(NOT VTK_RENDERING_BACKEND STREQUAL "None") + list(APPEND ITKVtkGlue_SRCS QuickView.cxx) +endif() + itk_module_add_library(ITKVtkGlue ${ITKVtkGlue_SRCS}) target_link_libraries_with_dynamic_lookup(ITKVtkGlue ${ITKVtkGlue_VTK_LIBRARIES}) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 77c7f17..e4ee4d1 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,30 +1,28 @@ itk_module_test() set(ITKVtkGlueTests - itkVtkConnectedComponentImageFilterTest - itkVtkMedianFilterTest.cxx itkImageToVTKImageFilterTest.cxx itkImageToVTKImageFilterRGBTest.cxx itkVTKImageToImageFilterTest.cxx itkMeshToVTKUnstructuredGridFilterTest.cxx - QuickViewTest.cxx + ) +if(NOT VTK_RENDERING_BACKEND STREQUAL "None") # ### runViewImage ### # No test generated. Use it for view images (2D or 3D) with: # ITKVtkGlueTestDriver runViewImage image_file # or with a string to change title window, and change size of window # ITKVtkGlueTestDriver runViewImage image_file "MyImage" - runViewImage.cxx - ) + list(APPEND ITKVtkGlueTests + runViewImage.cxx + QuickViewTest.cxx + itkVtkConnectedComponentImageFilterTest.cxx + itkVtkMedianFilterTest.cxx + ) +endif() CreateTestDriver(ITKVtkGlue "${ITKVtkGlue-Test_LIBRARIES}" "${ITKVtkGlueTests}") target_link_libraries_with_dynamic_lookup(ITKVtkGlueTestDriver ${ITKVtkGlue_VTK_LIBRARIES}) -itk_add_test(NAME itkVtkMedianImageFilterTest - COMMAND ITKVtkGlueTestDriver - itkVtkMedianFilterTest DATA{Input/cthead1.png} 2 - ) -set_property(TEST itkVtkMedianImageFilterTest APPEND PROPERTY LABELS REQUIRES_DISPLAY) - itk_add_test(NAME itkImageToVTKImageFilterTest COMMAND ITKVtkGlueTestDriver itkImageToVTKImageFilterTest @@ -40,22 +38,30 @@ itk_add_test(NAME itkVTKImageToImageFilterTest itkVTKImageToImageFilterTest ) -itk_add_test(NAME QuickViewTest - COMMAND ITKVtkGlueTestDriver - --compare DATA{Baseline/QuickViewTest.png,:} - ${ITK_TEST_OUTPUT_DIR}/QuickViewTest0.png - --compareNumberOfPixelsTolerance 1500 - QuickViewTest DATA{Input/peppers.png} ${ITK_TEST_OUTPUT_DIR} - ) -set_property(TEST QuickViewTest APPEND PROPERTY LABELS REQUIRES_DISPLAY) - -itk_add_test(NAME itkVtkConnectedComponentImageFilterTest - COMMAND ITKVtkGlueTestDriver - itkVtkConnectedComponentImageFilterTest DATA{Input/cthead1.png} - ) -set_property(TEST itkVtkConnectedComponentImageFilterTest APPEND PROPERTY LABELS REQUIRES_DISPLAY) - itk_add_test(NAME itkMeshToVTKUnstructuredGridFilterTest COMMAND ITKVtkGlueTestDriver itkMeshToVTKUnstructuredGridFilterTest DATA{Input/cow.vtk} ${ITK_TEST_OUTPUT_DIR}/cow_converted.vtk DATA{Input/cow.vtk} ) + +if(NOT VTK_RENDERING_BACKEND STREQUAL "None") + itk_add_test(NAME itkVtkMedianImageFilterTest + COMMAND ITKVtkGlueTestDriver + itkVtkMedianFilterTest DATA{Input/cthead1.png} 2 + ) + set_property(TEST itkVtkMedianImageFilterTest APPEND PROPERTY LABELS REQUIRES_DISPLAY) + + itk_add_test(NAME QuickViewTest + COMMAND ITKVtkGlueTestDriver + --compare DATA{Baseline/QuickViewTest.png,:} + ${ITK_TEST_OUTPUT_DIR}/QuickViewTest0.png + --compareNumberOfPixelsTolerance 1500 + QuickViewTest DATA{Input/peppers.png} ${ITK_TEST_OUTPUT_DIR} + ) + set_property(TEST QuickViewTest APPEND PROPERTY LABELS REQUIRES_DISPLAY) + + itk_add_test(NAME itkVtkConnectedComponentImageFilterTest + COMMAND ITKVtkGlueTestDriver + itkVtkConnectedComponentImageFilterTest DATA{Input/cthead1.png} + ) + set_property(TEST itkVtkConnectedComponentImageFilterTest APPEND PROPERTY LABELS REQUIRES_DISPLAY) +endif()