diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-11-03 14:44:11 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-11-03 14:44:11 -0700 |
| commit | 66ad158be46e09b2db4fe8be90841fc01d271c68 (patch) | |
| tree | c51f96082ae520bab62bfe8b3f350116d4ff562a | |
| parent | ba69dd7de132178ec37a7f1cefbf9c206a5fd6c1 (diff) | |
| download | vcpkg-66ad158be46e09b2db4fe8be90841fc01d271c68.tar.gz vcpkg-66ad158be46e09b2db4fe8be90841fc01d271c68.zip | |
[opencv] Disable MSMF in UWP due to an upstream bug
| -rw-r--r-- | ports/opencv/CONTROL | 2 | ||||
| -rw-r--r-- | ports/opencv/portfile.cmake | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL index c5896a516..47d8b2443 100644 --- a/ports/opencv/CONTROL +++ b/ports/opencv/CONTROL @@ -1,5 +1,5 @@ Source: opencv -Version: 3.3.1-5 +Version: 3.3.1-6 Build-Depends: zlib, libpng, libjpeg-turbo, tiff, protobuf (windows) Description: computer vision library diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake index 8e68379fa..f201ea706 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -57,6 +57,11 @@ if("vtk" IN_LIST FEATURES) set(WITH_VTK ON) endif() +set(WITH_MSMF ON) +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + set(WITH_MSMF OFF) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS @@ -101,7 +106,7 @@ vcpkg_configure_cmake( -DWITH_CUDA=${WITH_CUDA} -DWITH_FFMPEG=${WITH_FFMPEG} -DWITH_LAPACK=OFF - -DWITH_MSMF=ON + -DWITH_MSMF=${WITH_MSMF} -DWITH_OPENCLAMDBLAS=OFF -DWITH_OPENGL=ON -DWITH_QT=${WITH_QT} |