diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2020-12-11 23:16:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-11 14:16:29 -0800 |
| commit | e054fe2b20469c894b88be4ac466776f9f653954 (patch) | |
| tree | c38d367b5974c69f7d824b96f8dcdf594dd32041 /ports/opencv2 | |
| parent | c2329ab26a6e9e06da101d8541c393c102ba6c8c (diff) | |
| download | vcpkg-e054fe2b20469c894b88be4ac466776f9f653954.tar.gz vcpkg-e054fe2b20469c894b88be4ac466776f9f653954.zip | |
[OpenCV] fix compatibility with VTK9 (#12785)
Diffstat (limited to 'ports/opencv2')
| -rw-r--r-- | ports/opencv2/CONTROL | 6 | ||||
| -rw-r--r-- | ports/opencv2/portfile.cmake | 12 |
2 files changed, 1 insertions, 17 deletions
diff --git a/ports/opencv2/CONTROL b/ports/opencv2/CONTROL index 621cb34bd..1e9f57cdb 100644 --- a/ports/opencv2/CONTROL +++ b/ports/opencv2/CONTROL @@ -1,6 +1,6 @@ Source: opencv2 Version: 2.4.13.7 -Port-Version: 3 +Port-Version: 4 Build-Depends: zlib Description: computer vision library, version 2 Default-Features: eigen, jpeg, opengl, png, tiff @@ -45,9 +45,5 @@ Feature: tiff Build-Depends: tiff Description: TIFF support for opencv -Feature: vtk -Build-Depends: vtk -Description: vtk support for opencv - Feature: world Description: Compile to a single package support for opencv diff --git a/ports/opencv2/portfile.cmake b/ports/opencv2/portfile.cmake index 8e1fca5fb..6cd8b48a7 100644 --- a/ports/opencv2/portfile.cmake +++ b/ports/opencv2/portfile.cmake @@ -45,23 +45,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS "world" BUILD_opencv_world ) -set(WITH_VTK OFF) -if("vtk" IN_LIST FEATURES) - set(WITH_VTK ON) -endif() - set(WITH_MSMF ON) if(NOT VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) set(WITH_MSMF OFF) endif() -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - if (WITH_VTK) - message(WARNING "VTK is currently unsupported in this build configuration, turning it off") - set(WITH_VTK OFF) - endif() -endif() - if("ffmpeg" IN_LIST FEATURES) if(VCPKG_TARGET_IS_UWP) set(VCPKG_C_FLAGS "/sdl- ${VCPKG_C_FLAGS}") |