diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-09-22 22:09:39 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-09-22 23:20:58 -0700 |
| commit | 79fc7f4de584ff61445693a325f48e15b01e1a97 (patch) | |
| tree | 37b0e41f235e9099d3f525c26f3be39494c99af5 | |
| parent | b2ab8b48837a8cd9f266a8c8e7b2cfb9d9f414fe (diff) | |
| download | vcpkg-79fc7f4de584ff61445693a325f48e15b01e1a97.tar.gz vcpkg-79fc7f4de584ff61445693a325f48e15b01e1a97.zip | |
[opencv] Centralize download cache -- TODO: prevent opencv from performing downloads. Fix static builds.
| -rw-r--r-- | ports/opencv/CONTROL | 2 | ||||
| -rw-r--r-- | ports/opencv/portfile.cmake | 15 |
2 files changed, 12 insertions, 5 deletions
diff --git a/ports/opencv/CONTROL b/ports/opencv/CONTROL index 8130ef3b4..c2814c9c2 100644 --- a/ports/opencv/CONTROL +++ b/ports/opencv/CONTROL @@ -1,5 +1,5 @@ Source: opencv -Version: 3.3.0-3 +Version: 3.3.0-4 # Optional: Add in vtk to build with VTK and cuda to build with CUDA Build-Depends: zlib, libpng, libjpeg-turbo, tiff, protobuf (windows), ffmpeg Description: computer vision library diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake index 07ab1e130..d21956108 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -1,7 +1,3 @@ -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(STATUS "Warning: Static building not supported yet. Building dynamic.") - set(VCPKG_LIBRARY_LINKAGE dynamic) -endif() include(vcpkg_common_functions) vcpkg_from_github( @@ -38,6 +34,7 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_WITH_STATIC_CRT) 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 @@ -103,11 +100,13 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/${OpenCV_ARCH}) file(GLOB STATICLIB ${CURRENT_PACKAGES_DIR}/staticlib/*) if(STATICLIB) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/lib) file(COPY ${STATICLIB} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/staticlib) endif() file(GLOB STATICLIB ${CURRENT_PACKAGES_DIR}/debug/staticlib/*) if(STATICLIB) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/lib) file(COPY ${STATICLIB} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/staticlib) endif() @@ -119,6 +118,9 @@ string(REPLACE " vc14" " ${OpenCV_RUNTIME}" OPENCV_CONFIG "${OPENCV_CONFIG}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/OpenCVConfig.cmake "${OPENCV_CONFIG}") +if(EXISTS "${CURRENT_PACKAGES_DIR}/share/opencv/${OpenCV_ARCH}/${OpenCV_RUNTIME}/staticlib") + file(RENAME ${CURRENT_PACKAGES_DIR}/share/opencv/${OpenCV_ARCH}/${OpenCV_RUNTIME}/staticlib ${CURRENT_PACKAGES_DIR}/share/opencv/${OpenCV_ARCH}/${OpenCV_RUNTIME}/lib) +endif() file(READ ${CURRENT_PACKAGES_DIR}/share/opencv/${OpenCV_ARCH}/${OpenCV_RUNTIME}/lib/OpenCVModules-release.cmake OPENCV_CONFIG_LIB) string(REPLACE "/staticlib/" "/lib/" OPENCV_CONFIG_LIB "${OPENCV_CONFIG_LIB}") @@ -128,6 +130,9 @@ string(REPLACE "${CURRENT_INSTALLED_DIR}" "\${_IMPORT_PREFIX}" OPENCV_CONFIG_LIB "${OPENCV_CONFIG_LIB}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/opencv/${OpenCV_ARCH}/${OpenCV_RUNTIME}/lib/OpenCVModules-release.cmake "${OPENCV_CONFIG_LIB}") +if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/share/opencv/${OpenCV_ARCH}/${OpenCV_RUNTIME}/staticlib") + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/share/opencv/${OpenCV_ARCH}/${OpenCV_RUNTIME}/staticlib ${CURRENT_PACKAGES_DIR}/debug/share/opencv/${OpenCV_ARCH}/${OpenCV_RUNTIME}/lib) +endif() file(READ ${CURRENT_PACKAGES_DIR}/debug/share/opencv/${OpenCV_ARCH}/${OpenCV_RUNTIME}/lib/OpenCVModules-debug.cmake OPENCV_CONFIG_LIB) string(REPLACE "/staticlib/" "/lib/" OPENCV_CONFIG_LIB "${OPENCV_CONFIG_LIB}") @@ -145,3 +150,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) vcpkg_copy_pdbs() + +set(VCPKG_LIBRARY_LINKAGE "dynamic")
\ No newline at end of file |