diff options
| author | jasjuang <jasjuang@gmail.com> | 2017-08-20 00:25:43 -0700 |
|---|---|---|
| committer | jasjuang <jasjuang@gmail.com> | 2017-08-20 00:25:43 -0700 |
| commit | c23e69b00895a7672d0f4fd4ccedcbb4d58d4c2a (patch) | |
| tree | 95f1b242836853a3595fe42ba22f0dfca11e346b | |
| parent | 66ac9bb63a32603aa3d7a4903e79962eb937e565 (diff) | |
| download | vcpkg-c23e69b00895a7672d0f4fd4ccedcbb4d58d4c2a.tar.gz vcpkg-c23e69b00895a7672d0f4fd4ccedcbb4d58d4c2a.zip | |
use vcpkg_from_github
| -rw-r--r-- | ports/opencv/CONTROL | 2 | ||||
| -rw-r--r-- | ports/opencv/portfile.cmake | 30 |
2 files changed, 14 insertions, 18 deletions
diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL index 9360d64ed..8063511a7 100644 --- a/ports/opencv/CONTROL +++ b/ports/opencv/CONTROL @@ -1,6 +1,4 @@ Source: opencv Version: 3.3.0 Build-Depends: zlib, libpng, libjpeg-turbo, tiff, vtk, protobuf, ceres -# Uncomment the following line if building without opencv_contrib is desired -# Build-Depends: zlib, libpng, libjpeg-turbo, tiff, vtk Description: computer vision library diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake index 8405f1e1a..ace4c9fa6 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -3,13 +3,14 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/opencv-3.3.0) -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/opencv/opencv/archive/3.3.0.zip" - FILENAME "opencv-3.3.0.zip" - SHA512 14430c6225926e5118daccb57c7276d9f9160c90a034b2c73a09b73ac90ba7ebd3ae78cccffb4a10b58bb0e5e16ebd03bf617030fa74cc67d9d18366bf6b4951 + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO opencv/opencv + REF 3.3.0 + SHA512 b69923c9809d5533764b5db73db4f0be17f72b6d53643ee773824cfe8a98261d7dc5b4033895693bfd1454bc474c7f6152a5d0023a6f495324dd2b4b4a058e0d + HEAD_REF master ) -vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} @@ -19,15 +20,14 @@ vcpkg_apply_patches( ) file(REMOVE_RECURSE ${SOURCE_PATH}/3rdparty/libjpeg ${SOURCE_PATH}/3rdparty/libpng ${SOURCE_PATH}/3rdparty/zlib ${SOURCE_PATH}/3rdparty/libtiff) -# Uncomment the following lines and the lines under OPTIONS to build opencv_contrib -# Important: after uncommenting you've add protobuf dependency within CONTROL file -SET(CONTRIB_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/opencv_contrib-3.3.0) -vcpkg_download_distfile(CONTRIB_ARCHIVE - URLS "https://github.com/opencv/opencv_contrib/archive/3.3.0.zip" - FILENAME "opencv_contrib-3.3.0.zip" - SHA512 1c76d49689459708117acfbd0893cbfb915fbd0defff95702fb388a29d12b50fb53fbf246e64e68aa3adb347aa45ff478df5e2e8c6d9cfa57a628744bbb1bd04 +vcpkg_from_github( + OUT_SOURCE_PATH CONTRIB_SOURCE_PATH + REPO opencv/opencv_contrib + REF 3.3.0 + SHA512 ebe3dbe6c754c6fbaabbf6b0d2a4209964e625fd68e593f30ce043792740c8c1d4440d7870949b5b33f488fd7e2e05f3752287b7f50dd24c29202e268776520e + HEAD_REF master ) -vcpkg_extract_source_archive(${CONTRIB_ARCHIVE}) + vcpkg_apply_patches( SOURCE_PATH ${CONTRIB_SOURCE_PATH} PATCHES "${CMAKE_CURRENT_LIST_DIR}/open_contrib-remove-waldboost.patch" @@ -61,8 +61,6 @@ vcpkg_configure_cmake( -DWITH_OPENCLAMDBLAS=OFF -DWITH_LAPACK=OFF -DBUILD_opencv_dnn=OFF - - # uncomment the following 3 lines to build opencv_contrib modules -DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules -DBUILD_PROTOBUF=OFF -DUPDATE_PROTO_FILES=ON |