diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2018-03-14 15:30:25 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2018-03-14 15:30:25 -0700 |
| commit | 04030295c0bcd748a3766d5565d84f5c92f21c4c (patch) | |
| tree | 6d5aac91a5570c97f9418fe714c8896473e90930 | |
| parent | 263d4ba469027a42cdf8d965e44cfa8ca8677a82 (diff) | |
| download | vcpkg-04030295c0bcd748a3766d5565d84f5c92f21c4c.tar.gz vcpkg-04030295c0bcd748a3766d5565d84f5c92f21c4c.zip | |
[opencv] Fixes for contrib
| -rw-r--r-- | ports/opencv/CONTROL | 1 | ||||
| -rw-r--r-- | ports/opencv/portfile.cmake | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL index c4d5adaac..5450f3906 100644 --- a/ports/opencv/CONTROL +++ b/ports/opencv/CONTROL @@ -24,6 +24,7 @@ Build-Depends: eigen3, glog, gflags, ceres Description: opencv_sfm module Feature: contrib +Build-Depends: opencv[flann] Description: opencv_contrib module Feature: cuda diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake index 41e7b7406..78ed5fa51 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -66,6 +66,12 @@ if("contrib" IN_LIST FEATURES) SHA512 c16e60a6c4bb4de3ab39b876ae3c3f320ea56f69c93e9303bd2dff8760841dcd71be4161fff8bc71e8fe4fe8747fa8465d49d6bd8f5ebcdaea161f4bc2da7c93 ) + vcpkg_download_distfile(TINYDNN_ARCHIVE + URLS "https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz" + FILENAME "opencv-cache/tiny_dnn/adb1c512e09ca2c7a6faef36f9c53e59-v1.0.0a3.tar.gz" + SHA512 5f2c1a161771efa67e85b1fea395953b7744e29f61187ac5a6c54c912fb195b3aef9a5827135c3668bd0eeea5ae04a33cc433e1f6683e2b7955010a2632d168b + ) + function(download_opencv_3rdparty ID COMMIT HASH) if(NOT EXISTS "${DOWNLOADS}/opencv-cache/${ID}/${COMMIT}.stamp") vcpkg_download_distfile(OCV_DOWNLOAD |