Commit 634625ca authored by Ben Boeckel's avatar Ben Boeckel

cmake: simplify VTK_RENDERING_BACKEND conditionals

parent 95b3c6e1
......@@ -50,15 +50,10 @@ function(vtk_add_gl2ps_test_cxx)
set(_error_threshold 15)
endif()
# Unit test executable containing PNGCompare test:
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
set(PNGCompareTest vtkRenderingGL2PSOpenGL2CxxTests)
endif()
# Image diff rasterized png produced from a PS with baseline
ExternalData_add_test(VTKData
NAME ${vtk-module}Cxx-${TName}-VerifyRasterizedPNG
COMMAND "${PNGCompareTest}" PNGCompare
COMMAND "vtkRenderingGL2PSOpenGL2CxxTests" PNGCompare
-D "${VTK_TEST_DATA_DIR}"
-T "${VTK_TEST_OUTPUT_DIR}"
-E "${_error_threshold}"
......@@ -75,7 +70,7 @@ function(vtk_add_gl2ps_test_cxx)
if(${RASTERIZE_PDF})
ExternalData_add_test(VTKData
NAME ${vtk-module}Cxx-${TName}-VerifyRasterizedPDFPNG
COMMAND "${PNGCompareTest}" PNGCompare
COMMAND "vtkRenderingGL2PSOpenGL2CxxTests" PNGCompare
-D "${VTK_TEST_DATA_DIR}"
-T "${VTK_TEST_OUTPUT_DIR}"
-E "${_error_threshold}"
......@@ -125,15 +120,10 @@ function(vtk_add_pdf_test_cxx)
set(_error_threshold 15)
endif()
# Unit test executable containing PNGCompare test:
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
set(PNGCompareTest vtkRenderingGL2PSOpenGL2CxxTests)
endif()
# Image diff rasterized png produced from a PS with baseline
ExternalData_add_test(VTKData
NAME ${vtk-module}Cxx-${TName}-VerifyRasterizedPDFPNG
COMMAND "${PNGCompareTest}" PNGCompare
COMMAND "vtkRenderingGL2PSOpenGL2CxxTests" PNGCompare
-D "${VTK_TEST_DATA_DIR}"
-T "${VTK_TEST_OUTPUT_DIR}"
-E "${_error_threshold}"
......
......@@ -36,15 +36,10 @@ function(vtk_add_svg_test)
set(_error_threshold 15)
endif()
# Unit test executable containing PNGCompare test:
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
set(PNGCompareTest vtkRenderingGL2PSOpenGL2CxxTests)
endif()
# Image diff rasterized png produced from SVG with baseline
ExternalData_add_test(VTKData
NAME ${vtk-module}Cxx-${TName}-VerifyRasterizedPNG
COMMAND "${PNGCompareTest}" PNGCompare
COMMAND "vtkRenderingGL2PSOpenGL2CxxTests" PNGCompare
-D "${VTK_TEST_DATA_DIR}"
-T "${VTK_TEST_OUTPUT_DIR}"
-E "${_error_threshold}"
......
......@@ -50,12 +50,7 @@ vtk_add_test_python(
pointsPrecisions.py,NO_OUTPUT,NO_DATA,NO_VALID,NO_RT
tableBasedClip.py,NO_RT
GreenLagrangeStrain.py.py,NO_OUTPUT,NO_DATA,NO_VALID
TestMultiBlockStreamer.py
TestSampleImplicitFunctionFilter.py
TestRectilinearGridToTetrahedra.py
)
if ("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2")
vtk_add_test_python(
TestMultiBlockStreamer.py
TestSampleImplicitFunctionFilter.py
TestRectilinearGridToTetrahedra.py
)
endif()
......@@ -21,10 +21,5 @@ vtk_add_test_python(
largeImageOffset.py
largeImageParallel.py
TestProcrustesRigidCentroid.py
TestFacetReader.py
)
if ("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2")
vtk_add_test_python(
TestFacetReader.py
)
endif()
......@@ -9,27 +9,22 @@ vtk_add_test_python(
TestSPHInterpolator.py
TestSPHInterpolator2D.py
TestSPHInterpolatorWithCutoff.py
TestConnectedPointsFilter.py
TestDensifyPointCloudFilter.py
TestEuclideanClusterExtraction.py
TestEuclideanClusterExtraction2.py
TestExtractPoints.py
TestFitImplicitFunction.py
TestHierarchicalBinningFilter.py
TestPCACurvatureEstimation.py
TestPCACurvatureEstimation2.py
TestPCANormalEstimation.py
TestPCANormalEstimation2.py
TestPointDensityFilter.py
TestPointDensityGradient.py
TestRadiusOutlierRemoval.py
TestSignedDistanceFilter.py
TestStatisticalOutlierRemoval.py
TestUnsignedDistanceFilter.py
TestVoxelGridFilter.py
)
if ("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2")
vtk_add_test_python(
TestConnectedPointsFilter.py
TestDensifyPointCloudFilter.py
TestEuclideanClusterExtraction.py
TestEuclideanClusterExtraction2.py
TestExtractPoints.py
TestFitImplicitFunction.py
TestHierarchicalBinningFilter.py
TestPCACurvatureEstimation.py
TestPCACurvatureEstimation2.py
TestPCANormalEstimation.py
TestPCANormalEstimation2.py
TestPointDensityFilter.py
TestPointDensityGradient.py
TestRadiusOutlierRemoval.py
TestSignedDistanceFilter.py
TestStatisticalOutlierRemoval.py
TestUnsignedDistanceFilter.py
TestVoxelGridFilter.py
)
endif ()
if ("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2")
vtk_add_test_python(
vtk_add_test_python(
TestSMPContourGridWithSpanSpace.py
)
endif()
......@@ -14,6 +14,7 @@ set(QVTKLibSrcs
vtkQtDebugLeaksView.cxx
vtkQtTableModelAdapter.cxx
vtkQtTreeModelAdapter.cxx
QVTKOpenGLWidget.cxx
)
set(QVTKMocHeaders
......@@ -28,13 +29,9 @@ set(QVTKMocHeaders
vtkQtDebugLeaksView.h
vtkQtTableModelAdapter.h
vtkQtTreeModelAdapter.h
QVTKOpenGLWidget.h
)
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
list(APPEND QVTKLibSrcs QVTKOpenGLWidget.cxx)
list(APPEND QVTKMocHeaders QVTKOpenGLWidget.h)
endif()
set(add_qvtkwidget FALSE)
if(NOT VTK_LEGACY_REMOVE)
# QVTKWidget and related classes can only be added on Linux when
......
......@@ -97,8 +97,7 @@
* `QVTKOpenGLWidget::renderVTK`.
*
* @section Caveats
* QVTKOpenGLWidget only supports **OpenGL2** rendering backend. Thus is not available
* if VTK is built with **VTK_RENDERING_BACKEND** set to **OpenGL**.
* QVTKOpenGLWidget only supports **OpenGL2** rendering backend.
*
* QVTKOpenGLWidget is targeted for Qt version 5.5 and above.
*
......
......@@ -5,20 +5,15 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests
TestQtDebugLeaksView.cxx
TestQtTableModelAdapter.cxx
TestQtTreeModelAdapter.cxx
TestQVTKOpenGLWidgetPicking.cxx
TestQtSwapWindows.cxx
)
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
vtk_add_test_cxx(${vtk-module}CxxTests tests
TestQVTKOpenGLWidget.cxx
TestQVTKOpenGLWidgetWithDisabledInteractor.cxx
TestQVTKOpenGLWidgetWithMSAA.cxx
)
vtk_add_test_cxx(${vtk-module}CxxTests tests
NO_VALID
TestQVTKOpenGLWidgetPicking.cxx
TestQtSwapWindows.cxx
)
endif()
vtk_add_test_cxx(${vtk-module}CxxTests tests
TestQVTKOpenGLWidget.cxx
TestQVTKOpenGLWidgetWithDisabledInteractor.cxx
TestQVTKOpenGLWidgetWithMSAA.cxx
)
if(NOT VTK_LEGACY_REMOVE)
# tests use legacy QVTKWidget.
......
......@@ -12,9 +12,7 @@ if(NOT VTK_LEGACY_REMOVE)
list(APPEND LibSrcs QVTKWidget2.cxx)
endif()
if (VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
add_definitions(-DVTK_OPENGL2)
endif ()
add_definitions(-DVTK_OPENGL2)
find_package(Qt5 COMPONENTS OpenGL REQUIRED QUIET)
include_directories(${Qt5OpenGL_INCLUDE_DIRS})
......
include(vtkGhostscript)
include(vtkWkHtmlToImage)
if (VTK_WKHTMLTOIMAGE_EXECUTABLE AND VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
if (VTK_WKHTMLTOIMAGE_EXECUTABLE)
set(SVGTests
TestSVGContextExport.cxx,NO_DATA,NO_VALID
TestSVGContextShading.cxx,NO_DATA,NO_VALID
......@@ -26,23 +26,17 @@ if(VTK_GHOSTSCRIPT_EXECUTABLE)
TestGL2PSExporterMultipleRenderers.cxx
TestGL2PSExporterVolumeRaster.cxx
)
# TODO: Check why this test fails on OpenGL2
set(GL2PSTestsPDFOpenGL1
TestLinePlotGL2PS.cxx
)
set(GL2PSTestsPDF
${GL2PSTestsPDFBothOpenGL} ${GL2PSTestsPDFOpenGL1}
${GL2PSTestsPDFBothOpenGL}
)
# These only produce PDFs. They're separated since the above tests produce
# and verify both PDF and PS.
if (VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
set(PDFTests
TestPDFContextExport.cxx,NO_DATA
TestPDFContextShading.cxx,NO_DATA
TestPDFExporterContextPolyData.cxx
)
endif()
set(PDFTests
TestPDFContextExport.cxx,NO_DATA
TestPDFContextShading.cxx,NO_DATA
TestPDFExporterContextPolyData.cxx
)
endif()
vtk_add_test_cxx(${vtk-module}CxxTests tests
......@@ -108,13 +102,11 @@ set(TestGL2PSExporterVolumeRasterError 50)
include(vtkTestingGL2PS)
vtk_add_pdf_test_cxx(${PDFTests})
if (VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
# text allignment and rotation with TextAsPath off is not
# yet implemented for the OpenGL2 backend.
vtk_add_gl2ps_test_cxx(${GL2PSTests} ${GL2PSTestsPDFOpenGL1})
# test postscript and pdf
vtk_add_gl2ps_test_cxx(pdf ${GL2PSTestsPDFBothOpenGL})
endif()
# text allignment and rotation with TextAsPath off is not
# yet implemented for the OpenGL2 backend.
vtk_add_gl2ps_test_cxx(${GL2PSTests})
# test postscript and pdf
vtk_add_gl2ps_test_cxx(pdf ${GL2PSTestsPDFBothOpenGL})
include(vtkTestingSVG)
vtk_add_svg_test(${SVGTests})
......@@ -12,12 +12,7 @@ vtk_add_test_python(
TestChacoReader.py
TestSimplePointsReader.py
TestPlot3DMeta.py
)
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
vtk_add_test_python(
TestXYZMol.py
caffeine.py
caffeine_notrailingwhitespaces.py
)
endif()
)
vtk_add_test_cxx(${vtk-module}CxxTests tests
TestVRMLImporter.cxx,NO_VALID
)
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
vtk_add_test_cxx(${vtk-module}CxxTests tests
TestVRMLNormals.cxx
)
endif()
list(APPEND tests TestOBJImporter.cxx)
......@@ -23,36 +18,34 @@ ExternalData_add_test(VTKData
vtk_test_cxx_executable(${vtk-module}CxxTests tests)
if(NOT VTK_RENDERING_BACKEND STREQUAL "None")
include(vtkOpenGL)
include(vtkOpenGL)
vtk_module_test_executable(vtkimportobj OBJImporter.cxx)
vtk_module_test_executable(vtkimportobj OBJImporter.cxx)
# add_executable(vtkimportobj MACOSX_BUNDLE OBJImporter.cxx)
# target_link_libraries(vtkimportobj LINK_PRIVATE
# vtkIOXML vtkIOImport vtkRenderingOpenGL2)
vtk_opengl_link(vtkimportobj)
ExternalData_add_test(VTKData
NAME ${vtk-module}Cxx-OBJImport-MixedOrder1
COMMAND vtkimportobj
"${VTK_TEST_OUTPUT_DIR}"
DATA{../Data/Input/boxes_2.obj}
DATA{../Data/Input/boxes_2.obj.mtl}
DATA{../Data/Input/flare.jpg}
)
ExternalData_add_test(VTKData
NAME ${vtk-module}Cxx-OBJImport-NoMTL
COMMAND vtkimportobj
"${VTK_TEST_OUTPUT_DIR}"
DATA{../Data/Input/boxes_3_no_mtl.obj}
)
ExternalData_add_test(VTKData
NAME ${vtk-module}Cxx-OBJImport-MTLwithoutTextureFile
COMMAND vtkimportobj
"${VTK_TEST_OUTPUT_DIR}"
DATA{../Data/Input/boxes_4_mtl_no_texture.obj}
DATA{../Data/Input/boxes_4_mtl_no_texture.obj.mtl}
)
endif()
vtk_opengl_link(vtkimportobj)
ExternalData_add_test(VTKData
NAME ${vtk-module}Cxx-OBJImport-MixedOrder1
COMMAND vtkimportobj
"${VTK_TEST_OUTPUT_DIR}"
DATA{../Data/Input/boxes_2.obj}
DATA{../Data/Input/boxes_2.obj.mtl}
DATA{../Data/Input/flare.jpg}
)
ExternalData_add_test(VTKData
NAME ${vtk-module}Cxx-OBJImport-NoMTL
COMMAND vtkimportobj
"${VTK_TEST_OUTPUT_DIR}"
DATA{../Data/Input/boxes_3_no_mtl.obj}
)
ExternalData_add_test(VTKData
NAME ${vtk-module}Cxx-OBJImport-MTLwithoutTextureFile
COMMAND vtkimportobj
"${VTK_TEST_OUTPUT_DIR}"
DATA{../Data/Input/boxes_4_mtl_no_texture.obj}
DATA{../Data/Input/boxes_4_mtl_no_texture.obj.mtl}
)
......@@ -108,6 +108,7 @@ vtk_add_test_cxx(${vtk-module}CxxTests data_tests
TestSphereHandleWidget.cxx
TestSurfaceConstrainedHandleWidget.cxx
TestTensorProbeWidget.cxx
TestImageTracerWidget.cxx
)
if(NOT VTK_OPENGL_HAS_OSMESA)
......@@ -116,12 +117,6 @@ if(NOT VTK_OPENGL_HAS_OSMESA)
)
endif()
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
vtk_add_test_cxx(${vtk-module}CxxTests tests
TestImageTracerWidget.cxx
)
endif()
set(all_tests
${tests}
${no_valid_tests}
......
set (ContextOpenGL2CxxTests
TestPolyDataToContext.cxx
)
# Generic tests
vtk_add_test_cxx(${vtk-module}CxxTests tests
TestContext2D.cxx,NO_VALID
TestPolyDataToContext.cxx
)
# OpenGL2 specific tests
if ("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2")
vtk_add_test_cxx(${vtk-module}CxxTests tests
${ContextOpenGL2CxxTests}
)
endif ()
vtk_test_cxx_executable(${vtk-module}CxxTests tests)
......@@ -59,6 +59,7 @@ set(Module_SRCS
vtkMapperCollection.cxx
vtkMapper.cxx
vtkObserverMediator.cxx
vtkPointGaussianMapper.cxx
vtkPolyDataMapper2D.cxx
vtkPolyDataMapper.cxx
vtkProp3DCollection.cxx
......@@ -138,16 +139,11 @@ set(Module_SRCS
vtkRenderWidget.cxx
)
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
# needed as we do not have vtkRenderingOpenGLConfigure.h here
set_source_files_properties(
vtkRenderWindow.cxx # dummy out painterdevice adapter
vtkHardwareSelector.cxx # dummy out painter device adapter
PROPERTIES COMPILE_FLAGS -DVTK_OPENGL2)
list(APPEND Module_SRCS
vtkPointGaussianMapper.cxx
)
endif()
# needed as we do not have vtkRenderingOpenGLConfigure.h here
set_source_files_properties(
vtkRenderWindow.cxx # dummy out painterdevice adapter
vtkHardwareSelector.cxx # dummy out painter device adapter
PROPERTIES COMPILE_FLAGS -DVTK_OPENGL2)
set(${vtk-module}_HDRS
vtkGPUInfoListArray.h
......
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
set(extra_opengl2_tests
TestBlockOpacity.cxx
TestCompositePolyDataMapper2.cxx,NO_DATA
TestCompositePolyDataMapper2Picking.cxx,NO_DATA
TestCompositePolyDataMapper2Scalars.cxx,NO_DATA
TestCompositePolyDataMapper2CellScalars.cxx,NO_DATA
TestCompositePolyDataMapper2MixedGeometryCellScalars.cxx,NO_DATA
TestCompositePolyDataMapper2MixedGeometryEdges.cxx,NO_DATA
# composite glyphs are only supported on OpenGL2.
TestGlyph3DMapperTreeIndexingCompositeGlyphs.cxx,NO_DATA
TestMultiBlockPartialArrayPointData.cxx
TestMultiBlockPartialArrayFieldData.cxx
# the following produce incorrect results in OpenGL
TestTranslucentLUTAlphaBlending.cxx
TestTranslucentLUTTextureAlphaBlending.cxx
TestAreaSelections.cxx
TestValuePassFloatingPoint.cxx
TestToggleOSWithInteractor.cxx,NO_DATA
)
endif()
set(extra_opengl2_tests)
if (VTK_DEFAULT_RENDER_WINDOW_OFFSCREEN)
list(APPEND extra_opengl2_tests TestOffscreenIsOffscreen.cxx,NO_DATA,NO_VALID)
endif()
vtk_add_test_cxx(${vtk-module}CxxTests tests
${extra_opengl2_tests}
TestBlockOpacity.cxx
TestCompositePolyDataMapper2.cxx,NO_DATA
TestCompositePolyDataMapper2Picking.cxx,NO_DATA
TestCompositePolyDataMapper2Scalars.cxx,NO_DATA
TestCompositePolyDataMapper2CellScalars.cxx,NO_DATA
TestCompositePolyDataMapper2MixedGeometryCellScalars.cxx,NO_DATA
TestCompositePolyDataMapper2MixedGeometryEdges.cxx,NO_DATA
# composite glyphs are only supported on OpenGL2.
TestGlyph3DMapperTreeIndexingCompositeGlyphs.cxx,NO_DATA
TestMultiBlockPartialArrayPointData.cxx
TestMultiBlockPartialArrayFieldData.cxx
# the following produce incorrect results in OpenGL
TestTranslucentLUTAlphaBlending.cxx
TestTranslucentLUTTextureAlphaBlending.cxx
TestAreaSelections.cxx
TestValuePassFloatingPoint.cxx
TestToggleOSWithInteractor.cxx,NO_DATA
otherCoordinate.cxx,NO_DATA,NO_VALID
FrustumClip.cxx
Mace.cxx
......@@ -103,10 +99,8 @@ vtk_add_test_cxx(${vtk-module}CxxTests tests
# TestHierarchicalBoxPipeline.cxx # legacy code
)
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
set_source_files_properties(
TestEdgeFlags.cxx # fails on OpenGL Mesa
PROPERTIES COMPILE_FLAGS -DVTK_OPENGL2)
endif()
set_source_files_properties(
TestEdgeFlags.cxx # fails on OpenGL Mesa
PROPERTIES COMPILE_FLAGS -DVTK_OPENGL2)
vtk_test_cxx_executable(${vtk-module}CxxTests tests)
......@@ -44,15 +44,10 @@ vtk_add_test_python(
TestWindowToImageTransparency.py
TexturedSphere.py
cells.py,NO_RT
${glsl_tests}
)
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
vtk_add_test_python(
# TestScalarMaterialMode.py
pickCompositeData.py,NO_RT
)
endif()
${glsl_tests}
)
vtk_add_test_python(
TestOutOfRangeDiscretizableColorTransferFunction.py --useBelowRangeColor --useAboveRangeColor
......
......@@ -18,8 +18,6 @@ vtk_module_library(vtkRenderingExternal ${Module_SRCS})
include(vtkOpenGL)
vtk_opengl_link(${vtk-module})
if ("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2")
set_target_properties(
vtkRenderingExternal
PROPERTIES COMPILE_FLAGS -DVTK_OPENGL2)
endif ()
set_target_properties(
vtkRenderingExternal
PROPERTIES COMPILE_FLAGS -DVTK_OPENGL2)
vtk_add_test_python(
TestDepthImageToPointCloud.py
)
if ("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2")
vtk_add_test_python(
TestDepthImageToPointCloud-TwoInputs.py
)
endif()
set (RenderingOpenGL2PythonTests
vtk_add_test_python(
TestUserShader2.py
)
if ("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2")
vtk_add_test_python(
${RenderingOpenGL2PythonTests}
)
endif ()
......@@ -41,9 +41,7 @@ set_source_files_properties(
WRAP_EXCLUDE
)
if("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2")
add_definitions(-DVTK_OPENGL2)
endif()
add_definitions(-DVTK_OPENGL2)
vtk_module_library(vtkRenderingParallel ${Module_SRCS})
include(vtkOpenGL)
......
......@@ -7,6 +7,7 @@ set(Module_SRCS
vtkPLineIntegralConvolution2D.cxx
vtkPPainterCommunicator.cxx
vtkPSurfaceLICComposite.cxx
vtkPSurfaceLICInterface.cxx
${CMAKE_CURRENT_BINARY_DIR}/vtkRenderingParallelLICObjectFactory.cxx
)
......@@ -45,15 +46,10 @@ if (VTK_RENDERINGPARALLELLIC_LINEINTEGRALCONVLOLUTION2D_TIMER)
add_definitions("-DvtkLineIntegralConvolution2DTIME")
endif()
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
list(APPEND Module_SRCS
vtkPSurfaceLICInterface.cxx
)
vtk_add_override(vtkSurfaceLICInterface vtkPSurfaceLICInterface)
set(shader_files
vtkPSurfaceLICComposite_CompFS.glsl
)
endif()
vtk_add_override(vtkSurfaceLICInterface vtkPSurfaceLICInterface)
set(shader_files
vtkPSurfaceLICComposite_CompFS.glsl
)
unset(shader_h_files)
foreach(file ${shader_files})
......
# These tests are built under all conditions
set (GenericVolumeCxxTests
set (VolumeCxxTests
ProjectedTetrahedraZoomIn.cxx,NO_VALID
TestFinalColorWindowLevel.cxx
TestFixedPointRayCastLightComponents.cxx
......@@ -28,10 +27,6 @@ set (GenericVolumeCxxTests
TestSmartVolumeMapper.cxx
TestSmartVolumeMapperWindowLevel.cxx
TestGPURayCastCompositeBinaryMask1.cxx
)
# These tests are only built for the OpenGL2 backend
set (VolumeOpenGL2CxxTests
TestGPURayCastAverageIP.cxx
TestGPURayCastBlendModes.cxx
TestGPURayCastCameraInside.cxx
......@@ -103,16 +98,9 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
# everyone gets these tests
vtk_add_test_cxx(${vtk-module}CxxTests tests
${GenericVolumeCxxTests}
${VolumeCxxTests}
)
# If OpenGL2 backend, add all VolumeOpenGL2CxxTests
if ("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2")
vtk_add_test_cxx(${vtk-module}CxxTests tests
${VolumeOpenGL2CxxTests}
)
endif ()
vtk_test_cxx_executable(${vtk-module}CxxTests tests
RENDERING_FACTORY
${shader_c_files}
......
# These tests are built under all conditions
set (GenericVolumePythonTests
TestFixedPointRayCasterLinearCropped.py,NO_RT
TestFixedPointRayCasterLinear.py,NO_RT
TestFixedPointRayCasterNearestCropped.py,NO_RT
TestFixedPointRayCasterNearest.py,NO_RT
cursor3D.py
VolumePicker.py,NO_RT
VolumePickerCrop.py
)
# These tests are only built when the rendering backend is OpenGL2
set (VolumeOpenGL2PythonTests
gaussian.py
TestGPURayCastIndependentComponent.py,NO_RT
TestGPURayCastIndependentComponentMIP.py,NO_RT
TestGPURayCastIndependentComponentMinIP.py,NO_RT
TestGPURayCastUserShader.py
)
if ("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2")
vtk_add_test_python(
${GenericVolumePythonTests}
${VolumeOpenGL2PythonTests}
)
endif ()
vtk_add_test_python(
TestFixedPointRayCasterLinearCropped.py,NO_RT
TestFixedPointRayCasterLinear.py,NO_RT
TestFixedPointRayCasterNearestCropped.py,NO_RT
TestFixedPointRayCasterNearest.py,NO_RT
cursor3D.py
VolumePicker.py,NO_RT
VolumePickerCrop.py
gaussian.py
TestGPURayCastIndependentComponent.py,NO_RT
TestGPURayCastIndependentComponentMIP.py,NO_RT
TestGPURayCastIndependentComponentMinIP.py,NO_RT
TestGPURayCastUserShader.py
)
# These tests are built under all conditions
set (GenericVolumeTclTests
vtk_add_test_tcl(
TestFixedPointRayCasterLinearCropped.tcl
TestFixedPointRayCasterLinear.tcl
TestFixedPointRayCasterNearestCropped.tcl
TestFixedPointRayCasterNearest.tcl
)
if ("${VTK_RENDERING_BACKEND}" STREQUAL "OpenGL2")
vtk_add_test_tcl(
${GenericVolumeTclTests}
)
endif ()
......@@ -17,9 +17,7 @@ set_property(TARGET TimingTests APPEND PROPERTY
# Chemistry target
if(TARGET vtkDomainsChemistry)
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
list(APPEND extra_deps vtkDomainsChemistryOpenGL2)
endif()
list(APPEND extra_deps vtkDomainsChemistryOpenGL2)
list(APPEND compile_defs HAVE_CHEMISTRY)
include_directories(${VTK_SOURCE_DIR}/Domains/Chemistry
${VTK_BINARY_DIR}/Domains/Chemistry)
......
if(VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
set(extra_opengl2_tests
# the following produce incorrect results in OpenGL
TestConeLayoutStrategy.cxx
)
endif()
vtk_add_test_cxx(${vtk-module}CxxTests tests
${extra_opengl2_tests}
TestConeLayoutStrategy.cxx
TestCoincidentGraphLayoutView.cxx
TestColumnTree.cxx
TestDendrogramItem.cxx
......
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