Commit 3221bed9 authored by Ken Martin's avatar Ken Martin

Better support for no rendering

Fix a few issues related to selecting None as a rendering
backend.
parent d6b9c46a
......@@ -48,3 +48,15 @@ foreach(backend ${VTK_BACKENDS})
endforeach()
endif()
endforeach()
# check for None with rendering turned on
if("None" STREQUAL ${VTK_RENDERING_BACKEND} AND ${VTK_Group_Rendering})
message(FATAL_ERROR "VTK_Group_Rendering is on when the rendering backend is set to None. Please either turn off the rendering group or set the rendering backend to a different value")
endif()
if (${VTK_RENDERING_BACKEND} STREQUAL "None")
# with no backend make a dummy None modules
vtk_module(vtkRenderingNone )
vtk_module(vtkRenderingContextNone )
vtk_module(vtkRenderingVolumeNone )
endif()
......@@ -13,9 +13,13 @@ set(VTK_Group_StandAlone_DOCS "Request building of all stand alone modules (no e
foreach(group ${VTK_GROUPS})
message(STATUS "Group ${group} modules: ${VTK_GROUP_${group}_MODULES}")
# Set the default group option - Rendering ON, and all others OFF.
# Set the default group option - Rendering ON (if there is a backend)
if(${group} MATCHES "^Rendering|^StandAlone")
set(_default ON)
if(${group} MATCHES "^Rendering" AND "None" STREQUAL ${VTK_RENDERING_BACKEND})
set(_default OFF)
else()
set(_default ON)
endif()
else()
set(_default OFF)
endif()
......
......@@ -7,6 +7,7 @@ vtk_module(vtkCommonComputationalGeometry
vtkCommonDataModel
TEST_DEPENDS
vtkTestingCore
vtkRendering${VTK_RENDERING_BACKEND}
KIT
vtkCommon
)
......@@ -9,6 +9,7 @@ vtk_module(vtkCommonTransforms
vtkCommonMath
TEST_DEPENDS
vtkTestingCore
vtkRendering${VTK_RENDERING_BACKEND}
KIT
vtkCommon
)
......@@ -3,6 +3,8 @@ vtk_module(vtkFiltersTexture
StandAlone
DEPENDS
vtkFiltersGeneral
TEST_DEPENDS
vtkRendering${VTK_RENDERING_BACKEND}
KIT
vtkFilters
)
......@@ -3,6 +3,8 @@ vtk_module(vtkIOEnSight
StandAlone
DEPENDS
vtkCommonExecutionModel
TEST_DEPENDS
vtkRendering${VTK_RENDERING_BACKEND}
KIT
vtkIO
)
......@@ -7,6 +7,8 @@ vtk_module(vtkIOMINC
vtkRenderingCore
vtkFiltersHybrid
vtkIOImage
TEST_DEPENDS
vtkRendering${VTK_RENDERING_BACKEND}
PRIVATE_DEPENDS
vtksys
vtknetcdf
......
......@@ -9,4 +9,5 @@ vtk_module(vtkImagingHybrid
vtkTestingCore
vtkCommonCore
vtkCommonDataModel
vtkRendering${VTK_RENDERING_BACKEND}
)
......@@ -13,6 +13,7 @@ vtk_module(vtkParallelCore
vtkUtilitiesHashSource
TEST_DEPENDS
vtkTestingRendering
vtkRendering${VTK_RENDERING_BACKEND}
KIT
vtkParallel
)
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