diff options
Diffstat (limited to 'ports/opencv')
| -rw-r--r-- | ports/opencv/CONTROL | 7 | ||||
| -rw-r--r-- | ports/opencv/portfile.cmake | 14 |
2 files changed, 19 insertions, 2 deletions
diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL index 88ade6e28..3b5145535 100644 --- a/ports/opencv/CONTROL +++ b/ports/opencv/CONTROL @@ -1,5 +1,5 @@ Source: opencv -Version: 3.4.3-7 +Version: 3.4.3-8 Build-Depends: zlib Description: computer vision library Default-Features: opengl, jpeg, png, tiff, eigen, flann @@ -50,7 +50,7 @@ Build-Depends: vtk Description: vtk support for opencv Feature: gdcm -Build-Depends: gdcm2 +Build-Depends: gdcm Description: GDCM support for opencv Feature: webp @@ -81,5 +81,8 @@ Feature: eigen Build-Depends: eigen3 Description: Eigen support for opencv +Feature: world +Description: Compile to a single package support for opencv + Feature: nonfree Description: allow nonfree and unredistributable libraries diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake index 9ea245ed3..a3d8c894b 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -20,6 +20,11 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT) set(CMAKE_MODULE_PATH) +set(BUILD_opencv_world OFF) +if("world" IN_LIST FEATURES) + set(BUILD_opencv_world ON) +endif() + set(BUILD_opencv_dnn OFF) set(WITH_PROTOBUF OFF) if("dnn" IN_LIST FEATURES) @@ -274,6 +279,7 @@ vcpkg_configure_cmake( -DBUILD_opencv_python3=OFF -DBUILD_opencv_saliency=${BUILD_opencv_saliency} -DBUILD_opencv_sfm=${BUILD_opencv_sfm} + -DBUILD_opencv_world=${BUILD_opencv_world} # PROTOBUF -DPROTOBUF_UPDATE_FILES=${PROTOBUF_UPDATE_FILES} -DUPDATE_PROTO_FILES=${UPDATE_PROTO_FILES} @@ -388,6 +394,14 @@ string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${_VCPKG_INSTALLED_DIR}/\${VCPKG_TARGET_TRIPLET}" OPENCV_MODULES "${OPENCV_MODULES}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake "${OPENCV_MODULES}") +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)" OPENCV_MODULES "${OPENCV_MODULES}") + file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules.cmake "${OPENCV_MODULES}") +endif() + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) |