diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-11-03 12:42:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-03 12:42:06 -0700 |
| commit | ba69dd7de132178ec37a7f1cefbf9c206a5fd6c1 (patch) | |
| tree | 5ab0a4988dd0af39cbf5d839c7f47a125a69d3dc | |
| parent | 862823d8ace26594520dc3035fae3103ad16b48d (diff) | |
| parent | ee2452f066e96b717c88471892872f3e8a09b2ad (diff) | |
| download | vcpkg-ba69dd7de132178ec37a7f1cefbf9c206a5fd6c1.tar.gz vcpkg-ba69dd7de132178ec37a7f1cefbf9c206a5fd6c1.zip | |
Merge pull request #2108 from UnaNancyOwen/fix_opencv
Enable some options for OpenCV port
| -rw-r--r-- | ports/opencv/CONTROL | 2 | ||||
| -rw-r--r-- | ports/opencv/portfile.cmake | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL index f442e0cca..c5896a516 100644 --- a/ports/opencv/CONTROL +++ b/ports/opencv/CONTROL @@ -1,5 +1,5 @@ Source: opencv -Version: 3.3.1-4 +Version: 3.3.1-5 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 d712ce65e..8e68379fa 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -86,6 +86,7 @@ vcpkg_configure_cmake( # CMAKE -DCMAKE_DISABLE_FIND_PACKAGE_JNI=ON # ENABLE + -DENABLE_CXX11=ON -DENABLE_PYLINT=OFF # INSTALL -DINSTALL_FORCE_UNIX_PATHS=ON @@ -100,6 +101,7 @@ vcpkg_configure_cmake( -DWITH_CUDA=${WITH_CUDA} -DWITH_FFMPEG=${WITH_FFMPEG} -DWITH_LAPACK=OFF + -DWITH_MSMF=ON -DWITH_OPENCLAMDBLAS=OFF -DWITH_OPENGL=ON -DWITH_QT=${WITH_QT} |