aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjasjuang <jasjuang@gmail.com>2017-08-20 00:37:08 -0700
committerjasjuang <jasjuang@gmail.com>2017-08-20 00:37:08 -0700
commitb501937942cd05db41b4b6f1fdf8e7d7ecd2139b (patch)
tree31bcbc8b2a2365e620a93ffe815b6ae2c5328b87
parentc23e69b00895a7672d0f4fd4ccedcbb4d58d4c2a (diff)
downloadvcpkg-b501937942cd05db41b4b6f1fdf8e7d7ecd2139b.tar.gz
vcpkg-b501937942cd05db41b4b6f1fdf8e7d7ecd2139b.zip
build with ffmpeg
-rw-r--r--ports/opencv/CONTROL2
-rw-r--r--ports/opencv/portfile.cmake2
2 files changed, 2 insertions, 2 deletions
diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL
index 8063511a7..91efce30a 100644
--- a/ports/opencv/CONTROL
+++ b/ports/opencv/CONTROL
@@ -1,4 +1,4 @@
Source: opencv
Version: 3.3.0
-Build-Depends: zlib, libpng, libjpeg-turbo, tiff, vtk, protobuf, ceres
+Build-Depends: zlib, libpng, libjpeg-turbo, tiff, vtk, protobuf, ceres, ffmpeg
Description: computer vision library
diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake
index ace4c9fa6..5e4e1da1a 100644
--- a/ports/opencv/portfile.cmake
+++ b/ports/opencv/portfile.cmake
@@ -51,7 +51,7 @@ vcpkg_configure_cmake(
-DBUILD_TESTS=OFF
-DBUILD_WITH_DEBUG_INFO=ON
-DOpenCV_DISABLE_ARCH_PATH=ON
- -DWITH_FFMPEG=OFF
+ -DWITH_FFMPEG=ON
-DINSTALL_FORCE_UNIX_PATHS=ON
-DOPENCV_CONFIG_INSTALL_PATH=share/opencv
-DOPENCV_OTHER_INSTALL_PATH=share/opencv