diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-11-01 13:14:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-01 13:14:08 -0700 |
| commit | 93400414b05da83a4f615723b880650d845cfa7d (patch) | |
| tree | 56989ec59a0d871c1586a516aa0a621fd7dc3f16 | |
| parent | b54f4f26ae6c2b0944590d0de5c7fbf0d9ed38d7 (diff) | |
| parent | 726ed9738d3731f77b0b180ae02645908ea1f3dc (diff) | |
| download | vcpkg-93400414b05da83a4f615723b880650d845cfa7d.tar.gz vcpkg-93400414b05da83a4f615723b880650d845cfa7d.zip | |
Merge pull request #2098 from UnaNancyOwen/fix_opencv
Fix OpenCV port
| -rw-r--r-- | ports/opencv/CONTROL | 22 | ||||
| -rw-r--r-- | ports/opencv/portfile.cmake | 78 |
2 files changed, 58 insertions, 42 deletions
diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL index d6718f080..f442e0cca 100644 --- a/ports/opencv/CONTROL +++ b/ports/opencv/CONTROL @@ -1,19 +1,23 @@ Source: opencv -Version: 3.3.1-3 +Version: 3.3.1-4 Build-Depends: zlib, libpng, libjpeg-turbo, tiff, protobuf (windows) Description: computer vision library +Feature: sfm +Build-Depends: eigen3, glog, gflags +Description: opencv_sfm module + +Feature: cuda +Build-Depends: cuda +Description: CUDA support for opencv + Feature: ffmpeg Description: prebuilt ffmpeg support for opencv +Feature: qt +Build-Depends: qt5 +Description: Qt GUI support for opencv + Feature: vtk Build-Depends: vtk Description: vtk support for opencv - -Feature: cuda -Build-Depends: cuda -Description: CUDA support for opencv - -Feature: sfm -Build-Depends: eigen3, glog, gflags -Description: opencv_sfm module diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake index f3da28948..d712ce65e 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -32,9 +32,9 @@ vcpkg_apply_patches( string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT) -set(WITH_FFMPEG OFF) -if("ffmpeg" IN_LIST FEATURES) - set(WITH_FFMPEG ON) +set(BUILD_opencv_sfm OFF) +if("sfm" IN_LIST FEATURES) + set(BUILD_opencv_sfm ON) endif() set(WITH_CUDA OFF) @@ -42,55 +42,67 @@ if("cuda" IN_LIST FEATURES) set(WITH_CUDA ON) endif() +set(WITH_FFMPEG OFF) +if("ffmpeg" IN_LIST FEATURES) + set(WITH_FFMPEG ON) +endif() + +set(WITH_QT OFF) +if("qt" IN_LIST FEATURES) + set(WITH_QT ON) +endif() + set(WITH_VTK OFF) if("vtk" IN_LIST FEATURES) set(WITH_VTK ON) endif() -set(BUILD_opencv_sfm OFF) -if("sfm" IN_LIST FEATURES) - set(BUILD_opencv_sfm ON) -endif() - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS - "-DOPENCV_DOWNLOAD_PATH=${DOWNLOADS}/opencv-cache" - -DBUILD_WITH_STATIC_CRT=${BUILD_WITH_STATIC_CRT} - -DBUILD_ZLIB=OFF - -DBUILD_TIFF=OFF - -DBUILD_JPEG=OFF - -DBUILD_PNG=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_JNI=ON + # Ungrouped Entries + -DOpenCV_DISABLE_ARCH_PATH=ON + -DPROTOBUF_UPDATE_FILES=ON + -DUPDATE_PROTO_FILES=ON + # BUILD -DBUILD_DOCS=OFF -DBUILD_EXAMPLES=OFF - -DENABLE_PYLINT=OFF + -DBUILD_JPEG=OFF -DBUILD_PACKAGE=OFF -DBUILD_PERF_TESTS=OFF + -DBUILD_PNG=OFF + -DBUILD_PROTOBUF=OFF -DBUILD_TESTS=OFF + -DBUILD_TIFF=OFF -DBUILD_WITH_DEBUG_INFO=ON - -DOpenCV_DISABLE_ARCH_PATH=ON - -DINSTALL_FORCE_UNIX_PATHS=ON - -DOPENCV_CONFIG_INSTALL_PATH=share/opencv - -DOPENCV_OTHER_INSTALL_PATH=share/opencv - -DINSTALL_LICENSE=OFF - -DWITH_CUBLAS=OFF - -DWITH_OPENCLAMDBLAS=OFF - -DWITH_LAPACK=OFF - -DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules - -DBUILD_PROTOBUF=OFF - -DUPDATE_PROTO_FILES=ON - -DPROTOBUF_UPDATE_FILES=ON - + -DBUILD_WITH_STATIC_CRT=${BUILD_WITH_STATIC_CRT} + -DBUILD_ZLIB=OFF + -DBUILD_opencv_apps=OFF -DBUILD_opencv_dnn=ON + -DBUILD_opencv_flann=ON -DBUILD_opencv_python2=OFF -DBUILD_opencv_python3=OFF - -DBUILD_opencv_flann=ON - -DBUILD_opencv_apps=OFF -DBUILD_opencv_sfm=${BUILD_opencv_sfm} - - -DWITH_FFMPEG=${WITH_FFMPEG} + # CMAKE + -DCMAKE_DISABLE_FIND_PACKAGE_JNI=ON + # ENABLE + -DENABLE_PYLINT=OFF + # INSTALL + -DINSTALL_FORCE_UNIX_PATHS=ON + -DINSTALL_LICENSE=OFF + # OPENCV + -DOPENCV_CONFIG_INSTALL_PATH=share/opencv + "-DOPENCV_DOWNLOAD_PATH=${DOWNLOADS}/opencv-cache" + -DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules + -DOPENCV_OTHER_INSTALL_PATH=share/opencv + # WITH + -DWITH_CUBLAS=OFF -DWITH_CUDA=${WITH_CUDA} + -DWITH_FFMPEG=${WITH_FFMPEG} + -DWITH_LAPACK=OFF + -DWITH_OPENCLAMDBLAS=OFF + -DWITH_OPENGL=ON + -DWITH_QT=${WITH_QT} -DWITH_VTK=${WITH_VTK} OPTIONS_DEBUG -DINSTALL_HEADERS=OFF |