diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-08-23 21:48:09 +0200 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-08-23 12:48:09 -0700 |
| commit | d85a40d478e683561578d1f63bb992f8805e16cc (patch) | |
| tree | 9f534acb6269442edb0a82df3b48ca6925720175 /ports/opencv4 | |
| parent | cf447c050c734fc71e5254ea9e05e1bc4a9d208d (diff) | |
| download | vcpkg-d85a40d478e683561578d1f63bb992f8805e16cc.tar.gz vcpkg-d85a40d478e683561578d1f63bb992f8805e16cc.zip | |
[OpenCV 3] update to v3.4.7 (#7658)
* [opencv3] uniform CONTROL file with opencv4 port
* [opencv3] uniform portfile with opencv4
* [opencv3] uniform CONTROL file with opencv4 port
* [opencv3] update to 3.4.7 draft
* [OpenCV 3] wip to uniform port to opencv4 standards
* [OpenCV3] fix IPPICV integration, use the same mechanism as in OpenCV4 port
* [OpenCV3] fix sfm module
* [OpenCV3] update hunk references in patches 0001 and 0009
* [OpenCV3] refresh install options to adhere to opencv4 standards
* [opencv3] remove leftovers
* [opencv3] Use OUT_FEATURE_OPTIONS with vcpkg_check_features()
Diffstat (limited to 'ports/opencv4')
| -rw-r--r-- | ports/opencv4/CONTROL | 3 | ||||
| -rw-r--r-- | ports/opencv4/portfile.cmake | 13 |
2 files changed, 4 insertions, 12 deletions
diff --git a/ports/opencv4/CONTROL b/ports/opencv4/CONTROL index e16540656..29a119e2f 100644 --- a/ports/opencv4/CONTROL +++ b/ports/opencv4/CONTROL @@ -1,11 +1,12 @@ Source: opencv4 Version: 4.1.1-1 Build-Depends: protobuf, zlib +Homepage: https://github.com/opencv/opencv Description: computer vision library Default-Features: dnn, jpeg, opengl, png, tiff, webp Feature: nonfree -Description: opencv nonfree module +Description: allow nonfree and unredistributable libraries Feature: ade Build-Depends: ade diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index ed0b9f1e2..60ba8e5f5 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -6,10 +6,6 @@ include(vcpkg_common_functions) set(OPENCV_VERSION "4.1.1") -if(VCPKG_TARGET_IS_LINUX) - message("OpenCV currently requires the following library from the system package manager:\n libgtk3\n\nThis can be installed on Ubuntu systems via apt-get install libgtk-3-dev") -endif() - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/opencv @@ -288,14 +284,13 @@ vcpkg_configure_cmake( -DCURRENT_INSTALLED_DIR=${CURRENT_INSTALLED_DIR} ###### PROTOBUF -DPROTOBUF_UPDATE_FILES=ON - -DUPDATE_PROTO_FILES=ON + -DUPDATE_PROTO_FILES=ON ###### PYLINT/FLAKE8 -DENABLE_PYLINT=OFF -DENABLE_FLAKE8=OFF # CMAKE -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON -DCMAKE_DISABLE_FIND_PACKAGE_JNI=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON # ENABLE -DENABLE_CXX11=ON ###### OPENCV vars @@ -323,15 +318,10 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH "share/opencv" TARGET_PATH "share/opencv") vcpkg_copy_pdbs() -# OpenCV does not list TIFF as a dependency. -# We explicitly add it to the module file, -# in order to fix unresolved symbols linking problems -# for downstream projects using OpenCV as static library if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(READ ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake OPENCV_MODULES) string(REPLACE "set(CMAKE_IMPORT_FILE_VERSION 1)" "set(CMAKE_IMPORT_FILE_VERSION 1) -find_package(TIFF REQUIRED) find_package(Protobuf REQUIRED) if(Protobuf_FOUND) if(TARGET protobuf::libprotobuf) @@ -348,6 +338,7 @@ if(Protobuf_FOUND) ) endif() endif() +find_package(TIFF QUIET) find_package(HDF5 QUIET) find_package(Freetype QUIET) find_package(Ogre QUIET) |