]>
Commit | Line | Data |
---|---|---|
08b22f18 JR |
1 | --- opencv-3.1.0/cmake/OpenCVDetectVTK.cmake.orig 2015-12-18 16:02:16.000000000 +0100 |
2 | +++ opencv-3.1.0/cmake/OpenCVDetectVTK.cmake 2017-01-24 07:33:14.029499623 +0100 | |
3 | @@ -3,7 +3,14 @@ | |
4 | endif() | |
5 | ||
6 | # VTK 6.x components | |
7 | -find_package(VTK QUIET COMPONENTS vtkRenderingOpenGL vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE) | |
8 | +find_package(VTK QUIET COMPONENTS vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE) | |
9 | +IF(VTK_FOUND) | |
10 | + IF(VTK_RENDERING_BACKEND) #in vtk 7, the rendering backend is exported as a var. | |
11 | + find_package(VTK QUIET COMPONENTS vtkRendering${VTK_RENDERING_BACKEND} vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport vtkIOGeometry NO_MODULE) | |
12 | + ELSE(VTK_RENDERING_BACKEND) | |
13 | + find_package(VTK QUIET COMPONENTS vtkRenderingOpenGL vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE) | |
14 | + ENDIF(VTK_RENDERING_BACKEND) | |
15 | +ENDIF(VTK_FOUND) | |
16 | ||
17 | # VTK 5.x components | |
18 | if(NOT VTK_FOUND) |