mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-15 07:28:04 +08:00
f89336d703
* [tesseract] add missing reference for downstream projects * [tesseract] restore ci, fix many regressions that are uncovered by that * Update ports/opencv2/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [opencv] fix regressions on uwp, accept failure on arm64 for now * Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [opencv4] allow failures on all arm windows targets, both win32 and uwp * adopts hints from #15180 * [libarchive] bump control version * [libarchive] use vcpkg-cmake-wrapper instead of a custom libarchiveConfig, since it is vcpkg-provided and not port-provided * enable features to be visible in parent scope * apply documentation fix from CI * [libarchive] remove unnecessary lines in portfile * fix regressions * Update ports/gdcm/CONTROL * use more compact logic syntax * add new versions to baseline Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
42 lines
1.6 KiB
Diff
42 lines
1.6 KiB
Diff
diff --git a/cmake/OpenCVDetectVTK.cmake b/cmake/OpenCVDetectVTK.cmake
|
|
index 0f2b958..4c83504 100644
|
|
--- a/cmake/OpenCVDetectVTK.cmake
|
|
+++ b/cmake/OpenCVDetectVTK.cmake
|
|
@@ -1,12 +1,30 @@
|
|
+# VTK 9.0
|
|
+if(NOT VTK_FOUND)
|
|
+ find_package(VTK 9 QUIET NAMES vtk COMPONENTS
|
|
+ FiltersExtraction
|
|
+ FiltersSources
|
|
+ FiltersTexture
|
|
+ IOExport
|
|
+ IOGeometry
|
|
+ IOPLY
|
|
+ InteractionStyle
|
|
+ RenderingCore
|
|
+ RenderingLOD
|
|
+ RenderingOpenGL2
|
|
+ NO_MODULE)
|
|
+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)
|