From 7856f14558f37021c1d5b76ade40ac78e59a422d Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Sat, 30 May 2020 06:07:39 +0300 Subject: [PATCH 1/4] Added VTK 9 support --- cmake/OpenCVDetectVTK.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cmake/OpenCVDetectVTK.cmake b/cmake/OpenCVDetectVTK.cmake index 0f2b9584e120..23d17c352410 100644 --- a/cmake/OpenCVDetectVTK.cmake +++ b/cmake/OpenCVDetectVTK.cmake @@ -1,3 +1,10 @@ +# VTK 9.0 +find_package(VTK QUIET NAMES vtk COMPONENTS InteractionStyle RenderingLOD IOPLY FiltersTexture RenderingFreeType IOExport IOGeometry FiltersExtraction RenderingCore NO_MODULE) +if(VTK_FOUND) + set(HAVE_VTK ON) + return() +endif() + # VTK 6.x components find_package(VTK QUIET COMPONENTS vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE) IF(VTK_FOUND) From 1173e2fed5cedb2fdc71c8e64b4932e2113a46e9 Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Tue, 2 Jun 2020 19:23:10 +0300 Subject: [PATCH 2/4] fixup! Added VTK 9 support --- cmake/OpenCVDetectVTK.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/OpenCVDetectVTK.cmake b/cmake/OpenCVDetectVTK.cmake index 23d17c352410..bfe25fa606c8 100644 --- a/cmake/OpenCVDetectVTK.cmake +++ b/cmake/OpenCVDetectVTK.cmake @@ -1,5 +1,5 @@ # VTK 9.0 -find_package(VTK QUIET NAMES vtk COMPONENTS InteractionStyle RenderingLOD IOPLY FiltersTexture RenderingFreeType IOExport IOGeometry FiltersExtraction RenderingCore NO_MODULE) +find_package(VTK 9 QUIET NAMES vtk COMPONENTS InteractionStyle RenderingLOD IOPLY FiltersTexture RenderingFreeType IOExport IOGeometry FiltersExtraction RenderingCore NO_MODULE) if(VTK_FOUND) set(HAVE_VTK ON) return() From ced0b8475edb19c9e7e0a20d234446fc79a3b7e7 Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Tue, 2 Jun 2020 22:47:23 +0300 Subject: [PATCH 3/4] fixup! Added VTK 9 support --- cmake/OpenCVDetectVTK.cmake | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/cmake/OpenCVDetectVTK.cmake b/cmake/OpenCVDetectVTK.cmake index bfe25fa606c8..4a3e35377b57 100644 --- a/cmake/OpenCVDetectVTK.cmake +++ b/cmake/OpenCVDetectVTK.cmake @@ -1,5 +1,16 @@ # VTK 9.0 -find_package(VTK 9 QUIET NAMES vtk COMPONENTS InteractionStyle RenderingLOD IOPLY FiltersTexture RenderingFreeType IOExport IOGeometry FiltersExtraction RenderingCore NO_MODULE) +find_package(VTK 9 QUIET NAMES vtk COMPONENTS + FiltersExtraction + FiltersSources + FiltersTexture + IOExport + IOGeometry + IOPLY + InteractionStyle + RenderingCore + RenderingLOD + RenderingOpenGL2 + NO_MODULE) if(VTK_FOUND) set(HAVE_VTK ON) return() From 9a90817f39c1a6d5d6e52acffad4598b93f15df6 Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Fri, 5 Jun 2020 16:09:53 +0300 Subject: [PATCH 4/4] fixup! Added VTK 9 support --- cmake/OpenCVDetectVTK.cmake | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/cmake/OpenCVDetectVTK.cmake b/cmake/OpenCVDetectVTK.cmake index 4a3e35377b57..4c835040c528 100644 --- a/cmake/OpenCVDetectVTK.cmake +++ b/cmake/OpenCVDetectVTK.cmake @@ -1,5 +1,6 @@ # VTK 9.0 -find_package(VTK 9 QUIET NAMES vtk COMPONENTS +if(NOT VTK_FOUND) + find_package(VTK 9 QUIET NAMES vtk COMPONENTS FiltersExtraction FiltersSources FiltersTexture @@ -11,20 +12,19 @@ find_package(VTK 9 QUIET NAMES vtk COMPONENTS RenderingLOD RenderingOpenGL2 NO_MODULE) -if(VTK_FOUND) - set(HAVE_VTK ON) - return() endif() # VTK 6.x components -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. +if(NOT VTK_FOUND) + 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) + 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) + ENDIF(VTK_RENDERING_BACKEND) + ENDIF(VTK_FOUND) +endif() # VTK 5.x components if(NOT VTK_FOUND)