diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-02-27 11:56:29 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-02-27 11:56:29 -0800 |
| commit | 2cc7fa27e57f1129d1f37ccb009563509ca25720 (patch) | |
| tree | 3c75e423b71e54f6f65ec085c5d3d190d9d0d1a9 /ports/opencv | |
| parent | 3830517ec7519b823f5d8c404710889c6bd00278 (diff) | |
| parent | 2dfa568d186e4f0d199040929f9b3e44f27c8943 (diff) | |
| download | vcpkg-2cc7fa27e57f1129d1f37ccb009563509ca25720.tar.gz vcpkg-2cc7fa27e57f1129d1f37ccb009563509ca25720.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/5254
Diffstat (limited to 'ports/opencv')
| -rw-r--r-- | ports/opencv/CONTROL | 6 | ||||
| -rw-r--r-- | ports/opencv/portfile.cmake | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL index 41e73b195..03328915d 100644 --- a/ports/opencv/CONTROL +++ b/ports/opencv/CONTROL @@ -1,5 +1,5 @@ Source: opencv -Version: 3.4.3-5 +Version: 3.4.3-6 Build-Depends: zlib Description: computer vision library Default-Features: opengl, jpeg, png, tiff, eigen, flann @@ -37,6 +37,10 @@ Description: prebuilt ffmpeg support for opencv Feature: ipp Description: Enable Intel Integrated Performance Primitives +Feature: tbb +Build-Depends: tbb +Description: Enable Intel Threading Building Blocks + Feature: qt Build-Depends: qt5 Description: Qt GUI support for opencv diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake index 6fbb535cf..49e42466a 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -145,6 +145,11 @@ if("ipp" IN_LIST FEATURES) endif() endif() +set(WITH_TBB OFF) +if("tbb" IN_LIST FEATURES) + set(WITH_TBB ON) +endif() + set(WITH_QT OFF) if("qt" IN_LIST FEATURES) set(WITH_QT ON) @@ -282,7 +287,7 @@ vcpkg_configure_cmake( ${BUILD_WITH_CONTRIB_FLAG} -DOPENCV_OTHER_INSTALL_PATH=share/opencv # WITH - -DWITH_CUBLAS=OFF + -DWITH_CUBLAS=${WITH_CUDA} -DWITH_CUDA=${WITH_CUDA} -DWITH_EIGEN=${WITH_EIGEN} -DWITH_FFMPEG=${WITH_FFMPEG} @@ -299,6 +304,7 @@ vcpkg_configure_cmake( -DWITH_PNG=${WITH_PNG} -DWITH_PROTOBUF=${WITH_PROTOBUF} -DWITH_QT=${WITH_QT} + -DWITH_TBB=${WITH_TBB} -DWITH_TIFF=${WITH_TIFF} -DWITH_VTK=${WITH_VTK} -DWITH_WEBP=${WITH_WEBP} |