aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-11-25 13:45:33 -0800
committerRobert Schumacher <roschuma@microsoft.com>2017-11-25 13:45:33 -0800
commit4d274a7bffa1cf141f3be7d227702cea44df6894 (patch)
tree3dfc15f4322f8e8414e960bc20e716b9c074e3cc
parent90e520af8dbc4c68f9973240863f3fe5f722d3b4 (diff)
downloadvcpkg-4d274a7bffa1cf141f3be7d227702cea44df6894.tar.gz
vcpkg-4d274a7bffa1cf141f3be7d227702cea44df6894.zip
[opencv] Disable msvcrt check to allow prepackaged ffmpeg
-rw-r--r--ports/opencv/CONTROL2
-rw-r--r--ports/opencv/portfile.cmake4
2 files changed, 4 insertions, 2 deletions
diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL
index d41323609..2c80e5767 100644
--- a/ports/opencv/CONTROL
+++ b/ports/opencv/CONTROL
@@ -1,5 +1,5 @@
Source: opencv
-Version: 3.3.1-7
+Version: 3.3.1-9
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 b6958abfd..b309edb89 100644
--- a/ports/opencv/portfile.cmake
+++ b/ports/opencv/portfile.cmake
@@ -201,4 +201,6 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
vcpkg_copy_pdbs()
-set(VCPKG_LIBRARY_LINKAGE "dynamic") \ No newline at end of file
+set(VCPKG_LIBRARY_LINKAGE "dynamic")
+
+set(VCPKG_POLICY_ALLOW_OBSOLETE_MSVCRT enabled)