diff options
Diffstat (limited to 'libraries/opencv/patch_vtk7.diff')
| -rw-r--r-- | libraries/opencv/patch_vtk7.diff | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/libraries/opencv/patch_vtk7.diff b/libraries/opencv/patch_vtk7.diff deleted file mode 100644 index a34d3458b2938..0000000000000 --- a/libraries/opencv/patch_vtk7.diff +++ /dev/null @@ -1,21 +0,0 @@ -# Patch for VTK-7.x derived by diff from upstream: -# https://raw.githubusercontent.com/opencv/opencv/master/cmake/OpenCVDetectVTK.cmake -# ---- cmake/OpenCVDetectVTK.cmake.orig 2015-12-19 01:02:16.000000000 +1000 -+++ cmake/OpenCVDetectVTK.cmake 2016-11-19 15:46:10.468197286 +1000 -@@ -3,7 +3,14 @@ - endif() - - # VTK 6.x components --find_package(VTK QUIET COMPONENTS vtkRenderingOpenGL vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE) -+find_package(VTK QUIET COMPONENTS vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE) -+IF(VTK_FOUND) -+ IF(VTK_RENDERING_BACKEND) #in vtk 7, the rendering backend is exported as a var. -+ find_package(VTK QUIET COMPONENTS vtkRendering${VTK_RENDERING_BACKEND} vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport vtkIOGeometry NO_MODULE) -+ ELSE(VTK_RENDERING_BACKEND) -+ find_package(VTK QUIET COMPONENTS vtkRenderingOpenGL vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE) -+ ENDIF(VTK_RENDERING_BACKEND) -+ENDIF(VTK_FOUND) - - # VTK 5.x components - if(NOT VTK_FOUND) |