From e96a36cfb072ea33a02a9734ef4c2e197788f61b Mon Sep 17 00:00:00 2001
From: "Marcus D. Hanwell" <marcus.hanwell@kitware.com>
Date: Fri, 20 Jun 2014 12:27:02 -0400
Subject: [PATCH] Move several TEST_DEPENDS to switch on backend
These tests should work with either backend, and were inadvertently
merged with a hard dependency on OpenGL2 backend.
Change-Id: I25356b499d2317143db37e3fa59b04c5b1c53710
---
IO/Exodus/module.cmake | 2 +-
IO/GDAL/module.cmake | 2 +-
IO/Geometry/module.cmake | 2 +-
IO/Import/module.cmake | 2 +-
IO/LSDyna/module.cmake | 2 +-
IO/Legacy/module.cmake | 2 +-
IO/MPIImage/module.cmake | 2 +-
IO/MPIParallel/module.cmake | 2 +-
IO/NetCDF/module.cmake | 2 +-
IO/PLY/module.cmake | 2 +-
IO/ParallelLSDyna/module.cmake | 2 +-
IO/ParallelNetCDF/module.cmake | 2 +-
IO/VPIC/module.cmake | 2 +-
IO/XML/module.cmake | 2 +-
Imaging/Core/module.cmake | 2 +-
Infovis/BoostGraphAlgorithms/module.cmake | 2 +-
Infovis/Core/module.cmake | 2 +-
Infovis/Layout/module.cmake | 2 +-
Rendering/Matplotlib/module.cmake | 2 +-
19 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/IO/Exodus/module.cmake b/IO/Exodus/module.cmake
index c7f992a9cee..59238f23eaa 100644
--- a/IO/Exodus/module.cmake
+++ b/IO/Exodus/module.cmake
@@ -10,5 +10,5 @@ vtk_module(vtkIOExodus
TEST_DEPENDS
vtkTestingRendering
vtkInteractionStyle
- vtkRenderingOpenGL2
+ vtkRendering${VTK_RENDERING_BACKEND}
)
diff --git a/IO/GDAL/module.cmake b/IO/GDAL/module.cmake
index 03dddfe5a40..9cc5214b8f5 100644
--- a/IO/GDAL/module.cmake
+++ b/IO/GDAL/module.cmake
@@ -4,7 +4,7 @@ vtk_module(vtkIOGDAL
vtkCommonExecutionModel
TEST_DEPENDS
vtkTestingCore
- vtkRenderingOpenGL2
+ vtkRendering${VTK_RENDERING_BACKEND}
vtkTestingRendering
vtkInteractionStyle
)
diff --git a/IO/Geometry/module.cmake b/IO/Geometry/module.cmake
index 491740f16b5..8ceff1d0802 100644
--- a/IO/Geometry/module.cmake
+++ b/IO/Geometry/module.cmake
@@ -14,7 +14,7 @@ vtk_module(vtkIOGeometry
vtkIOAMR
vtkIOLegacy
vtkFiltersGeometry
- vtkRenderingOpenGL2
+ vtkRendering${VTK_RENDERING_BACKEND}
vtkTestingRendering
vtkInteractionStyle
)
diff --git a/IO/Import/module.cmake b/IO/Import/module.cmake
index 07b35831618..f835f3378fc 100644
--- a/IO/Import/module.cmake
+++ b/IO/Import/module.cmake
@@ -7,7 +7,7 @@ vtk_module(vtkIOImport
PRIVATE_DEPENDS
vtkFiltersSources
TEST_DEPENDS
- vtkRenderingOpenGL2
+ vtkRendering${VTK_RENDERING_BACKEND}
vtkTestingRendering
vtkInteractionStyle
)
diff --git a/IO/LSDyna/module.cmake b/IO/LSDyna/module.cmake
index 68340a949ee..627514ec293 100644
--- a/IO/LSDyna/module.cmake
+++ b/IO/LSDyna/module.cmake
@@ -7,7 +7,7 @@ vtk_module(vtkIOLSDyna
PRIVATE_DEPENDS
vtksys
TEST_DEPENDS
- vtkRenderingOpenGL2
+ vtkRendering${VTK_RENDERING_BACKEND}
vtkTestingRendering
vtkInteractionStyle
)
diff --git a/IO/Legacy/module.cmake b/IO/Legacy/module.cmake
index 83811cc16d6..38f7ad352dd 100644
--- a/IO/Legacy/module.cmake
+++ b/IO/Legacy/module.cmake
@@ -11,6 +11,6 @@ vtk_module(vtkIOLegacy
TEST_DEPENDS
vtkFiltersAMR
vtkInteractionStyle
- vtkRenderingOpenGL2
+ vtkRendering${VTK_RENDERING_BACKEND}
vtkTestingRendering
)
diff --git a/IO/MPIImage/module.cmake b/IO/MPIImage/module.cmake
index cb084414817..9f9c4a02c05 100644
--- a/IO/MPIImage/module.cmake
+++ b/IO/MPIImage/module.cmake
@@ -12,5 +12,5 @@ vtk_module(vtkIOMPIImage
vtkTestingCore
vtkTestingRendering
vtkInteractionStyle
- vtkRenderingOpenGL2
+ vtkRendering${VTK_RENDERING_BACKEND}
)
diff --git a/IO/MPIParallel/module.cmake b/IO/MPIParallel/module.cmake
index 78e55c387d0..f7acbdaa323 100644
--- a/IO/MPIParallel/module.cmake
+++ b/IO/MPIParallel/module.cmake
@@ -9,7 +9,7 @@ vtk_module(vtkIOMPIParallel
PRIVATE_DEPENDS
vtksys
TEST_DEPENDS
- vtkRenderingOpenGL2
+ vtkRendering${VTK_RENDERING_BACKEND}
vtkTestingRendering
vtkInteractionStyle
)
diff --git a/IO/NetCDF/module.cmake b/IO/NetCDF/module.cmake
index 13fdb7bc51a..7ab050f365a 100644
--- a/IO/NetCDF/module.cmake
+++ b/IO/NetCDF/module.cmake
@@ -10,7 +10,7 @@ vtk_module(vtkIONetCDF
vtknetcdf
TEST_DEPENDS
vtkCommonExecutionModel
- vtkRenderingOpenGL2
+ vtkRendering${VTK_RENDERING_BACKEND}
vtkTestingRendering
vtkInteractionStyle
)
diff --git a/IO/PLY/module.cmake b/IO/PLY/module.cmake
index d383b8d8ab8..1254b7ce30d 100644
--- a/IO/PLY/module.cmake
+++ b/IO/PLY/module.cmake
@@ -6,7 +6,7 @@ vtk_module(vtkIOPLY
vtkCommonExecutionModel
vtkIOGeometry
TEST_DEPENDS
- vtkRenderingOpenGL2
+ vtkRendering${VTK_RENDERING_BACKEND}
vtkIOImage
vtkTestingRendering
vtkInteractionStyle
diff --git a/IO/ParallelLSDyna/module.cmake b/IO/ParallelLSDyna/module.cmake
index 49ab85fb1dd..ec274c755b3 100644
--- a/IO/ParallelLSDyna/module.cmake
+++ b/IO/ParallelLSDyna/module.cmake
@@ -8,5 +8,5 @@ vtk_module(vtkIOParallelLSDyna
vtkRenderingParallel
vtkTestingRendering
vtkInteractionStyle
- vtkRenderingOpenGL2
+ vtkRendering${VTK_RENDERING_BACKEND}
)
diff --git a/IO/ParallelNetCDF/module.cmake b/IO/ParallelNetCDF/module.cmake
index 31983484420..06d08837c8e 100644
--- a/IO/ParallelNetCDF/module.cmake
+++ b/IO/ParallelNetCDF/module.cmake
@@ -8,7 +8,7 @@ vtk_module(vtkIOParallelNetCDF
vtknetcdf
TEST_DEPENDS
vtkCommonExecutionModel
- vtkRenderingOpenGL2
+ vtkRendering${VTK_RENDERING_BACKEND}
vtkTestingRendering
vtkInteractionStyle
)
diff --git a/IO/VPIC/module.cmake b/IO/VPIC/module.cmake
index 68de3d767e0..6a2ac7cc17d 100644
--- a/IO/VPIC/module.cmake
+++ b/IO/VPIC/module.cmake
@@ -4,7 +4,7 @@ vtk_module(vtkIOVPIC
vtkCommonExecutionModel
vtkParallelCore
TEST_DEPENDS
- vtkRenderingOpenGL2
+ vtkRendering${VTK_RENDERING_BACKEND}
vtkTestingRendering
vtkInteractionStyle
)
diff --git a/IO/XML/module.cmake b/IO/XML/module.cmake
index afa2eb8d4b8..86d7fe52126 100644
--- a/IO/XML/module.cmake
+++ b/IO/XML/module.cmake
@@ -15,7 +15,7 @@ vtk_module(vtkIOXML
vtkImagingSources
vtkInfovisCore
vtkIOLegacy
- vtkRenderingOpenGL2
+ vtkRendering${VTK_RENDERING_BACKEND}
vtkTestingCore
vtkTestingRendering
vtkInteractionStyle
diff --git a/Imaging/Core/module.cmake b/Imaging/Core/module.cmake
index 482be77e4fc..c1246efd032 100644
--- a/Imaging/Core/module.cmake
+++ b/Imaging/Core/module.cmake
@@ -12,7 +12,7 @@ vtk_module(vtkImagingCore
vtkFiltersModeling
vtkFiltersGeneral
vtkFiltersHybrid
- vtkRenderingOpenGL2
+ vtkRendering${VTK_RENDERING_BACKEND}
vtkTestingRendering
vtkInteractionStyle
vtkInteractionImage
diff --git a/Infovis/BoostGraphAlgorithms/module.cmake b/Infovis/BoostGraphAlgorithms/module.cmake
index 5933e3d125c..75d04fe3bc4 100644
--- a/Infovis/BoostGraphAlgorithms/module.cmake
+++ b/Infovis/BoostGraphAlgorithms/module.cmake
@@ -3,7 +3,7 @@ vtk_module(vtkInfovisBoostGraphAlgorithms
vtkInfovisCore
vtkCommonExecutionModel
TEST_DEPENDS
- vtkRenderingOpenGL2
+ vtkRendering${VTK_RENDERING_BACKEND}
vtkTestingRendering
vtkInteractionStyle
vtkIOInfovis
diff --git a/Infovis/Core/module.cmake b/Infovis/Core/module.cmake
index e3cfd124123..b00c5c47d25 100644
--- a/Infovis/Core/module.cmake
+++ b/Infovis/Core/module.cmake
@@ -8,7 +8,7 @@ vtk_module(vtkInfovisCore
vtkFiltersGeneral
TEST_DEPENDS
vtkInfovisLayout
- vtkRenderingOpenGL2
+ vtkRendering${VTK_RENDERING_BACKEND}
vtkTestingRendering
vtkInteractionStyle
vtkIOInfovis
diff --git a/Infovis/Layout/module.cmake b/Infovis/Layout/module.cmake
index d631cc00790..78f9f705ce3 100644
--- a/Infovis/Layout/module.cmake
+++ b/Infovis/Layout/module.cmake
@@ -8,7 +8,7 @@ vtk_module(vtkInfovisLayout
vtkInfovisCore
TEST_DEPENDS
vtkRenderingLabel
- vtkRenderingOpenGL2
+ vtkRendering${VTK_RENDERING_BACKEND}
vtkTestingRendering
vtkInteractionStyle
vtkIOInfovis
diff --git a/Rendering/Matplotlib/module.cmake b/Rendering/Matplotlib/module.cmake
index d54673eafd9..8dc0598d376 100644
--- a/Rendering/Matplotlib/module.cmake
+++ b/Rendering/Matplotlib/module.cmake
@@ -14,7 +14,7 @@ vtk_module(vtkRenderingMatplotlib
vtkTestingRendering
vtkInteractionStyle
vtkRenderingGL2PS
- vtkRenderingOpenGL2
+ vtkRendering${VTK_RENDERING_BACKEND}
vtkRenderingFreeTypeOpenGL
vtkViewsContext2D
)
--
GitLab