Commit e23c2220 authored by Ben Boeckel's avatar Ben Boeckel
Browse files

modules: update modules for OpenGL1 removal

parent be28895f
......@@ -11,8 +11,8 @@ vtk_module(vtkAcceleratorsVTKm
TEST_DEPENDS
vtkTestingCore
vtkTestingRendering
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingVolume${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkRenderingVolumeOpenGL2
vtkRenderingFreeType
vtkIOLegacy
vtkIOPLY
......
......@@ -60,9 +60,6 @@ set(VTK_DEFAULT_EGL_DEVICE_INDEX "${default_egl_device_index}" CACHE STRING
mark_as_advanced(VTK_DEFAULT_EGL_DEVICE_INDEX)
# Some sanity checks for use of EGL.
if (VTK_OPENGL_HAS_EGL AND VTK_RENDERING_BACKEND STREQUAL "OpenGL")
message(FATAL_ERROR "You can use VTK_OPENGL_HAS_EGL only for `OpenGL2` rendering backend")
endif()
if (VTK_OPENGL_HAS_EGL AND ANDROID)
message(FATAL_ERROR "You cannot use VTK_OPENGL_HAS_EGL on the ANDROID platform")
endif()
......
......@@ -51,9 +51,7 @@ function(vtk_add_gl2ps_test_cxx)
endif()
# Unit test executable containing PNGCompare test:
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL")
set(PNGCompareTest vtkRenderingGL2PSCxxTests)
elseif(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
set(PNGCompareTest vtkRenderingGL2PSOpenGL2CxxTests)
endif()
......@@ -128,9 +126,7 @@ function(vtk_add_pdf_test_cxx)
endif()
# Unit test executable containing PNGCompare test:
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL")
set(PNGCompareTest vtkRenderingGL2PSCxxTests)
elseif(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
set(PNGCompareTest vtkRenderingGL2PSOpenGL2CxxTests)
endif()
......
......@@ -37,9 +37,7 @@ function(vtk_add_svg_test)
endif()
# Unit test executable containing PNGCompare test:
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL")
set(PNGCompareTest vtkRenderingGL2PSCxxTests)
elseif(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
set(PNGCompareTest vtkRenderingGL2PSOpenGL2CxxTests)
endif()
......
......@@ -5,7 +5,7 @@ vtk_module(vtkChartsCore
vtkTestingCore
vtkTestingRendering
vtkViewsContext2D
vtkRenderingContext${VTK_RENDERING_BACKEND}
vtkRenderingContextOpenGL2
#vtkIOExport
vtkIOInfovis
DEPENDS
......@@ -20,4 +20,4 @@ vtk_module(vtkChartsCore
vtkCommonExecutionModel
vtkCommonTransforms
vtkInfovisCore
)
\ No newline at end of file
)
......@@ -2,7 +2,7 @@ vtk_module(vtkCommonColor
TEST_DEPENDS
vtkIOImage
vtkCommonExecutionModel
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkTestingCore
vtkTestingRendering
vtkInteractionStyle
......@@ -11,4 +11,4 @@ vtk_module(vtkCommonColor
DEPENDS
vtkCommonCore
vtkCommonDataModel
)
\ No newline at end of file
)
......@@ -3,10 +3,10 @@ vtk_module(vtkCommonComputationalGeometry
StandAlone
TEST_DEPENDS
vtkTestingCore
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
KIT
vtkCommon
DEPENDS
vtkCommonCore
vtkCommonDataModel
)
\ No newline at end of file
)
......@@ -78,11 +78,11 @@
//
// @code{.cpp}
// #include "vtkAutoInit.h"
// VTK_MODULE_INIT(vtkRenderingOpenGL);
// VTK_MODULE_INIT(vtkRenderingOpenGL2);
// @endcode
//
// The above snippet if included in the global scope will ensure the object
// factories for vtkRenderingOpenGL are correctly registered and unregistered.
// factories for vtkRenderingOpenGL2 are correctly registered and unregistered.
#define VTK_MODULE_INIT(M) \
VTK_AUTOINIT_DECLARE(M) \
static struct M##_ModuleInit { \
......
......@@ -16,8 +16,8 @@ vtk_module(vtkCommonDataModel
vtkChartsCore
vtkViewsContext2D
vtkRenderingCore
vtkRenderingContext${VTK_RENDERING_BACKEND}
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingContextOpenGL2
vtkRenderingOpenGL2
KIT
vtkCommon
DEPENDS
......
......@@ -3,10 +3,10 @@ vtk_module(vtkCommonTransforms
StandAlone
TEST_DEPENDS
vtkTestingCore
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
KIT
vtkCommon
DEPENDS
vtkCommonCore
vtkCommonMath
)
\ No newline at end of file
)
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
set(extra_opengl_depend vtkDomainsChemistry${VTK_RENDERING_BACKEND})
endif()
vtk_module(vtkDomainsChemistry
GROUPS
StandAlone
......@@ -10,8 +7,8 @@ vtk_module(vtkDomainsChemistry
vtkTestingCore
vtkTestingRendering
vtkInteractionStyle
vtkRendering${VTK_RENDERING_BACKEND}
${extra_opengl_depend}
vtkRenderingOpenGL2
vtkDomainsChemistryOpenGL2
DEPENDS
vtkCommonCore
vtkCommonDataModel
......
if(TARGET vtkRenderingOpenGL)
message(FATAL_ERROR "vtkChemistyOpenGL2 cannot be built with vtkRenderingOpenGL, please disable one of them.")
endif()
include(vtkObjectFactory)
set(Module_SRCS
......
......@@ -13,8 +13,7 @@ vtk_module(vtkDomainsChemistryOpenGL2
vtkTestingCore
vtkTestingRendering
vtkInteractionStyle
vtkRendering${VTK_RENDERING_BACKEND}
${extra_opengl_depend}
vtkRenderingOpenGL2
DEPENDS
vtkCommonCore
vtkDomainsChemistry
......@@ -25,4 +24,4 @@ vtk_module(vtkDomainsChemistryOpenGL2
vtkCommonMath
vtkRenderingCore
vtkglew
)
\ No newline at end of file
)
......@@ -4,7 +4,7 @@ vtk_module(vtkDomainsMicroscopy
vtkTestingCore
vtkTestingRendering
vtkInteractionImage
vtkRenderingContext${VTK_RENDERING_BACKEND}
vtkRenderingContextOpenGL2
EXCLUDE_FROM_ALL
DEPENDS
vtkIOImage
......@@ -12,4 +12,4 @@ vtk_module(vtkDomainsMicroscopy
vtkCommonCore
vtkCommonDataModel
vtkCommonExecutionModel
)
\ No newline at end of file
)
......@@ -16,7 +16,7 @@ find_package(VTK COMPONENTS
vtkIOLegacy
vtkIOXML
vtkInteractionStyle
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkTestingCore
)
include(${VTK_USE_FILE})
......
......@@ -10,7 +10,7 @@ vtk_module_config(VTK
vtkFiltersSources
vtkInteractionStyle
vtkRenderingLabel
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
)
include(${VTK_USE_FILE})
......
......@@ -8,7 +8,7 @@ vtk_module_config(VTK
vtkCommonDataModel
vtkFiltersGeometry
vtkInteractionStyle
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
)
include(${VTK_USE_FILE})
......
......@@ -6,7 +6,7 @@ find_package(VTK COMPONENTS
vtkGUISupportQt
vtkIOImage
vtkInteractionImage
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkTestingCore
)
include(${VTK_USE_FILE})
......
......@@ -14,7 +14,7 @@ vtk_module_config(VTK
vtkImagingStatistics
vtkImagingStencil
vtkInteractionStyle
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkRenderingCore
vtkTestingCore
vtkTestingRendering
......
......@@ -17,7 +17,7 @@ vtk_module_config(VTK
vtkGUISupportQt
vtkIOInfovis
vtkInfovisCore
vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingOpenGL2
vtkViewsCore
vtkViewsInfovis
vtkViewsQt
......
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