From f56e321d3a7f2e491fd23a51f50fefb55ca444d2 Mon Sep 17 00:00:00 2001 From: Akhil Kumar Date: Thu, 19 Sep 2019 03:13:40 +0530 Subject: [PATCH] Update for supporting OpenCV 4.1.1 (#8) * Update for supporting OpenCV 4.1.1 * Update for supporting OpenCV 4.1.1 * sha update * point to https://github.com/cpp-pm/opencv/archive/v4.1.1-p0.tar.gz * OpenCV version 4.1.1-p0 * fix spaces --- cmake/configs/default.cmake | 4 ++-- cmake/projects/OpenCV-Extra/hunter.cmake | 11 +++++++++++ cmake/projects/OpenCV/hunter.cmake | 13 +++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index aa14fbc49..3561014c9 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -101,8 +101,8 @@ hunter_default_version(OpenAL VERSION 1.18.2) hunter_default_version(OpenBLAS VERSION 0.3.7) hunter_default_version(OpenCL VERSION 2.1-p3) hunter_default_version(OpenCL-cpp VERSION 2.0.10-p0) -hunter_default_version(OpenCV VERSION 4.0.0-p3) -hunter_default_version(OpenCV-Extra VERSION 4.0.0) +hunter_default_version(OpenCV VERSION 4.1.1-p0) +hunter_default_version(OpenCV-Extra VERSION 4.1.1) hunter_default_version(OpenNMTTokenizer VERSION 1.11.0-p1) hunter_default_version(OpenSSL VERSION 1.1.1c) hunter_default_version(OpenSceneGraph VERSION 3.6.3-p0) diff --git a/cmake/projects/OpenCV-Extra/hunter.cmake b/cmake/projects/OpenCV-Extra/hunter.cmake index 93161a4e8..6cca8df2c 100644 --- a/cmake/projects/OpenCV-Extra/hunter.cmake +++ b/cmake/projects/OpenCV-Extra/hunter.cmake @@ -7,6 +7,17 @@ include(hunter_add_version) include(hunter_download) include(hunter_pick_scheme) +hunter_add_version( + PACKAGE_NAME + OpenCV-Extra + VERSION + "4.1.1" + URL + "https://github.com/opencv/opencv_contrib/archive/4.1.1.tar.gz" + SHA1 + bb7e39790b04a0a23e0ea1d4882f45c4add3adb7 +) + hunter_add_version( PACKAGE_NAME OpenCV-Extra diff --git a/cmake/projects/OpenCV/hunter.cmake b/cmake/projects/OpenCV/hunter.cmake index ad0c05051..d64347ce9 100644 --- a/cmake/projects/OpenCV/hunter.cmake +++ b/cmake/projects/OpenCV/hunter.cmake @@ -12,6 +12,19 @@ include(hunter_download) include(hunter_pick_scheme) # List of versions here... + +hunter_add_version( + PACKAGE_NAME + OpenCV + VERSION + "4.1.1-p0" + URL + "https://github.com/cpp-pm/opencv/archive/v4.1.1-p0.tar.gz" + SHA1 + 9df096bd5afd6fa7dc02651491a1de04b46b4556 +) + + hunter_add_version( PACKAGE_NAME OpenCV