3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-30 20:59:12 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1619 from jasjuang/master

Browse Source 
update opencv and enable contrib
This commit is contained in:
Alexander Karatarakis 2017-09-21 12:22:28 -07:00 committed by GitHub
commit 1bf6f39147
2 changed files with 84 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ports/opencv/CONTROL
View File

@ -1,6 +1,5 @@
Source: opencv Source: opencv
Version: 3.2.0-4 Version: 3.3.0
Build-Depends: zlib, libpng, libjpeg-turbo, tiff # Optional: Add in vtk to build with VTK and cuda to build with CUDA
#Use the following line instead for optional features from OpenCV-contrib that require protobuf Build-Depends: zlib, libpng, libjpeg-turbo, tiff, protobuf, ceres, ffmpeg
#Build-Depends: zlib, libpng, libjpeg-turbo, tiff, protobuf
Description: computer vision library Description: computer vision library

112
ports/opencv/portfile.cmake
View File

@ -3,13 +3,14 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
set(VCPKG_LIBRARY_LINKAGE dynamic) set(VCPKG_LIBRARY_LINKAGE dynamic)
endif() endif()
include(vcpkg_common_functions) include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/opencv-3.2.0)
vcpkg_download_distfile(ARCHIVE vcpkg_from_github(
URLS "https://github.com/opencv/opencv/archive/3.2.0.zip" OUT_SOURCE_PATH SOURCE_PATH
FILENAME "opencv-3.2.0.zip" REPO opencv/opencv
SHA512 c6418d2a7654fe9d50611e756778df4c6736f2de76b85773efbf490bb475dd95ec1041fe57a87163ce11a7db44430cd378c8416af3319f979ced92532bf5ebb5 REF 3.3.0
SHA512 b69923c9809d5533764b5db73db4f0be17f72b6d53643ee773824cfe8a98261d7dc5b4033895693bfd1454bc474c7f6152a5d0023a6f495324dd2b4b4a058e0d
HEAD_REF master
) )
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_apply_patches( vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
@ -19,19 +20,18 @@ vcpkg_apply_patches(
) )
file(REMOVE_RECURSE ${SOURCE_PATH}/3rdparty/libjpeg ${SOURCE_PATH}/3rdparty/libpng ${SOURCE_PATH}/3rdparty/zlib ${SOURCE_PATH}/3rdparty/libtiff) 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 vcpkg_from_github(
# Important: after uncommenting you've add protobuf dependency within CONTROL file OUT_SOURCE_PATH CONTRIB_SOURCE_PATH
#SET(CONTRIB_SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/opencv_contrib-3.2.0) REPO opencv/opencv_contrib
#vcpkg_download_distfile(CONTRIB_ARCHIVE REF 3.3.0
# URLS "https://github.com/opencv/opencv_contrib/archive/3.2.0.zip" SHA512 ebe3dbe6c754c6fbaabbf6b0d2a4209964e625fd68e593f30ce043792740c8c1d4440d7870949b5b33f488fd7e2e05f3752287b7f50dd24c29202e268776520e
# FILENAME "opencv_contrib-3.2.0.zip" HEAD_REF master
# SHA512 da6cda7a7ae1d722967e18f9b8d60895b93bbc3664dfdb1645cb4d8b337a9c4207b9073fd546a596c48a489f92d15191aa34c7c607167b536fbe4937b8424b43 )
#)
#vcpkg_extract_source_archive(${CONTRIB_ARCHIVE}) vcpkg_apply_patches(
#vcpkg_apply_patches( SOURCE_PATH ${CONTRIB_SOURCE_PATH}
# SOURCE_PATH ${CONTRIB_SOURCE_PATH} PATCHES "${CMAKE_CURRENT_LIST_DIR}/open_contrib-remove-waldboost.patch"
# PATCHES "${CMAKE_CURRENT_LIST_DIR}/open_contrib-remove-waldboost.patch" )
#)
vcpkg_configure_cmake( vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH} SOURCE_PATH ${SOURCE_PATH}
@ -51,20 +51,23 @@ vcpkg_configure_cmake(
-DBUILD_TESTS=OFF -DBUILD_TESTS=OFF
-DBUILD_WITH_DEBUG_INFO=ON -DBUILD_WITH_DEBUG_INFO=ON
-DOpenCV_DISABLE_ARCH_PATH=ON -DOpenCV_DISABLE_ARCH_PATH=ON
-DWITH_FFMPEG=OFF -DWITH_FFMPEG=ON
-DINSTALL_FORCE_UNIX_PATHS=ON -DINSTALL_FORCE_UNIX_PATHS=ON
-DOPENCV_CONFIG_INSTALL_PATH=share/opencv -DOPENCV_CONFIG_INSTALL_PATH=share/opencv
-DOPENCV_OTHER_INSTALL_PATH=share/opencv -DOPENCV_OTHER_INSTALL_PATH=share/opencv
-DINSTALL_LICENSE=OFF -DINSTALL_LICENSE=OFF
# Optional: change to ON to build with CUDA
-DWITH_CUDA=OFF -DWITH_CUDA=OFF
-DWITH_CUBLAS=OFF -DWITH_CUBLAS=OFF
-DWITH_OPENCLAMDBLAS=OFF -DWITH_OPENCLAMDBLAS=OFF
-DWITH_LAPACK=OFF -DWITH_LAPACK=OFF
-DBUILD_opencv_dnn=ON
# uncomment the following 3 lines to build opencv_contrib modules -DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules
#-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules -DBUILD_PROTOBUF=OFF
#-DBUILD_PROTOBUF=OFF -DUPDATE_PROTO_FILES=ON
#-DUPDATE_PROTO_FILES=ON -DPROTOBUF_UPDATE_FILES=ON
# Optional: change to ON to build with VTK
-DWITH_VTK=OFF
OPTIONS_DEBUG OPTIONS_DEBUG
-DINSTALL_HEADERS=OFF -DINSTALL_HEADERS=OFF
-DINSTALL_OTHER=OFF -DINSTALL_OTHER=OFF
@ -72,13 +75,60 @@ vcpkg_configure_cmake(
vcpkg_install_cmake() vcpkg_install_cmake()
file(READ ${CURRENT_PACKAGES_DIR}/debug/share/opencv/OpenCVModules-debug.cmake OPENCV_DEBUG_MODULE)
string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" OPENCV_DEBUG_MODULE "${OPENCV_DEBUG_MODULE}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVModules-debug.cmake "${OPENCV_DEBUG_MODULE}")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/opencv) file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/opencv)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/opencv/LICENSE ${CURRENT_PACKAGES_DIR}/share/opencv/copyright) file(RENAME ${CURRENT_PACKAGES_DIR}/share/opencv/LICENSE ${CURRENT_PACKAGES_DIR}/share/opencv/copyright)
file(REMOVE ${CURRENT_PACKAGES_DIR}/LICENSE)
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/LICENSE)
if(${VCPKG_PLATFORM_TOOLSET} STREQUAL "v150")
set(OpenCV_RUNTIME vc15)
else()
set(OpenCV_RUNTIME vc14)
endif()
if(${VCPKG_TARGET_ARCHITECTURE} STREQUAL "x64")
set(OpenCV_ARCH x64)
else()
set(OpenCV_ARCH x86)
endif()
file(GLOB BIN_AND_LIB ${CURRENT_PACKAGES_DIR}/${OpenCV_ARCH}/${OpenCV_RUNTIME}/*)
file(COPY ${BIN_AND_LIB} DESTINATION ${CURRENT_PACKAGES_DIR})
file(GLOB DEBUG_BIN_AND_LIB ${CURRENT_PACKAGES_DIR}/debug/${OpenCV_ARCH}/${OpenCV_RUNTIME}/*)
file(COPY ${DEBUG_BIN_AND_LIB} DESTINATION ${CURRENT_PACKAGES_DIR}/debug)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/${OpenCV_ARCH})
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/${OpenCV_ARCH})
file(GLOB SHARE_LIB ${CURRENT_PACKAGES_DIR}/share/opencv/${OpenCV_ARCH}/${OpenCV_RUNTIME}/*)
file(COPY ${SHARE_LIB} DESTINATION ${CURRENT_PACKAGES_DIR}/share/opencv)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/opencv/${OpenCV_ARCH})
file(READ ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVConfig.cmake OPENCV_CONFIG)
string(REPLACE "\${OpenCV_ARCH}/\${OpenCV_RUNTIME}/"
"" OPENCV_CONFIG "${OPENCV_CONFIG}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVConfig.cmake "${OPENCV_CONFIG}")
file(READ ${CURRENT_PACKAGES_DIR}/share/opencv/lib/OpenCVConfig.cmake OPENCV_CONFIG_LIB)
string(REPLACE "get_filename_component(OpenCV_INSTALL_PATH \"\${OpenCV_CONFIG_PATH}/../../../../../"
"get_filename_component(OpenCV_INSTALL_PATH \"\${OpenCV_CONFIG_PATH}/../../../" OPENCV_CONFIG_LIB "${OPENCV_CONFIG_LIB}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/lib/OpenCVConfig.cmake "${OPENCV_CONFIG_LIB}")
file(READ ${CURRENT_PACKAGES_DIR}/share/opencv/lib/OpenCVModules.cmake OPENCV_MODULES)
string(REPLACE "get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\n"
"get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)\n" OPENCV_MODULES "${OPENCV_MODULES}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/lib/OpenCVModules.cmake "${OPENCV_MODULES}")
file(READ ${CURRENT_PACKAGES_DIR}/share/opencv/lib/OpenCVModules-release.cmake OPENCV_MODULES_RELEASE)
string(REPLACE "${OpenCV_ARCH}/${OpenCV_RUNTIME}/"
"" OPENCV_MODULES_RELEASE "${OPENCV_MODULES_RELEASE}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/lib/OpenCVModules-release.cmake "${OPENCV_MODULES_RELEASE}")
file(READ ${CURRENT_PACKAGES_DIR}/debug/share/opencv/${OpenCV_ARCH}/${OpenCV_RUNTIME}/lib/OpenCVModules-debug.cmake OPENCV_MODULES_DEBUG)
string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" OPENCV_MODULES_DEBUG "${OPENCV_MODULES_DEBUG}")
string(REPLACE "${OpenCV_ARCH}/${OpenCV_RUNTIME}/"
"" OPENCV_MODULES_DEBUG "${OPENCV_MODULES_DEBUG}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/lib/OpenCVModules-debug.cmake "${OPENCV_MODULES_DEBUG}")
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
vcpkg_copy_pdbs() vcpkg_copy_pdbs()