Commit 0e89804e authored by Cédric Traizet's avatar Cédric Traizet

ENH: Use OpenCV 4.1.1 in SuperBuild

parent b5754b09
......@@ -34,8 +34,8 @@ ADD_SUPERBUILD_CMAKE_VAR(OPENCV PNG_LIBRARY)
ExternalProject_Add(OPENCV
PREFIX OPENCV
URL "https://github.com/opencv/opencv/archive/3.4.1.tar.gz"
URL_MD5 a0b7a47899e67b3490ea31edc4f6e8e6
URL "https://github.com/opencv/opencv/archive/4.1.1.tar.gz"
URL_MD5 d9d3138d12e52bb0684f4a5862f6a46c
BINARY_DIR ${OPENCV_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
......
diff -burN opencv-3.4.1.orig/CMakeLists.txt opencv-3.4.1/CMakeLists.txt
--- opencv-3.4.1.orig/CMakeLists.txt Wed Sep 26 15:10:50 2018
+++ opencv-3.4.1/CMakeLists.txt Wed Sep 26 15:12:40 2018
@@ -373,7 +373,7 @@
if(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows)
if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH)
- ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
+ ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "") #${OpenCV_ARCH}/${OpenCV_RUNTIME}/")
else()
message(STATUS "Can't detect runtime and/or arch")
ocv_update(OpenCV_INSTALL_BINARIES_PREFIX "")
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment