diff options
| author | Griffin Downs <grdowns@microsoft.com> | 2019-02-27 16:44:17 -0800 |
|---|---|---|
| committer | Griffin Downs <grdowns@microsoft.com> | 2019-02-27 16:44:17 -0800 |
| commit | 1908903508bf057ad05d8a344e5bc55477944cb6 (patch) | |
| tree | 2a23595f1e7d8cc9a6358bfd44a00eb7368d8a1b /ports/opencv/portfile.cmake | |
| parent | b0a2ff18c9f2c9131aed131f5bf0d97c0e23da8e (diff) | |
| parent | 8564602d06d7c4ce236f96a4f0f3ba7c2d769cb0 (diff) | |
| download | vcpkg-1908903508bf057ad05d8a344e5bc55477944cb6.tar.gz vcpkg-1908903508bf057ad05d8a344e5bc55477944cb6.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/grdowns/4802
Diffstat (limited to 'ports/opencv/portfile.cmake')
| -rw-r--r-- | ports/opencv/portfile.cmake | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake index 36564a0a6..5bafe84ba 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -13,7 +13,7 @@ vcpkg_from_github( "${CMAKE_CURRENT_LIST_DIR}/0002-install-options.patch" "${CMAKE_CURRENT_LIST_DIR}/0003-disable-downloading.patch" "${CMAKE_CURRENT_LIST_DIR}/0004-use-find-package-required.patch" - "${CMAKE_CURRENT_LIST_DIR}/0005-remove-protobuf-target.patch" + "${CMAKE_CURRENT_LIST_DIR}/0005-remove-custom-protobuf-find-package.patch" ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT) @@ -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) @@ -288,7 +293,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} @@ -297,6 +302,7 @@ vcpkg_configure_cmake( -DWITH_JASPER=${WITH_JASPER} -DWITH_JPEG=${WITH_JPEG} -DWITH_LAPACK=OFF + -DWITH_MATLAB=OFF -DWITH_MSMF=${WITH_MSMF} -DWITH_OPENCLAMDBLAS=OFF -DWITH_OPENEXR=${WITH_OPENEXR} @@ -304,6 +310,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} |