From 5d399d585a0caaae12bf6e10928e1022102470d2 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 22 Feb 2018 06:16:21 -0800 Subject: [opencv] Ensure rework is starting from a fresh set of sources --- ports/opencv/portfile.cmake | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ports/opencv/portfile.cmake b/ports/opencv/portfile.cmake index 5ccf1c66f..f3efaa779 100644 --- a/ports/opencv/portfile.cmake +++ b/ports/opencv/portfile.cmake @@ -2,6 +2,14 @@ include(vcpkg_common_functions) set(OPENCV_PORT_VERSION "3.4.0") +# This is to ensure we are patching clean sources. These lines can be removed when the OpenCV version is next upgraded. +if(EXISTS "${CURRENT_BUILDTREES_DIR}/src/opencv-${OPENCV_PORT_VERSION}" AND NOT EXISTS "${CURRENT_BUILDTREES_DIR}/src/opencv-${OPENCV_PORT_VERSION}/rework.stamp") + file(REMOVE_RECURSE + "${CURRENT_BUILDTREES_DIR}/src/opencv-opencv-${OPENCV_PORT_VERSION}.tar.gz.extracted" + "${CURRENT_BUILDTREES_DIR}/src/opencv-${OPENCV_PORT_VERSION}" + ) +endif() + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/opencv @@ -19,6 +27,8 @@ vcpkg_apply_patches( "${CMAKE_CURRENT_LIST_DIR}/0004-use-find-package-required.patch" ) +file(WRITE "${CURRENT_BUILDTREES_DIR}/src/opencv-${OPENCV_PORT_VERSION}/rework.stamp") + vcpkg_download_distfile(TINYDNN_ARCHIVE URLS "https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz" FILENAME "opencv-cache/tiny_dnn/adb1c512e09ca2c7a6faef36f9c53e59-v1.0.0a3.tar.gz" -- cgit v1.2.3