Andrew Geissler | 7f40b71 | 2020-05-15 14:09:53 -0500 | [diff] [blame] | 1 | From 9b4959b97d2e95d4b49cf6ca2a3fce3cdb484f2d Mon Sep 17 00:00:00 2001 |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 2 | From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> |
| 3 | Date: Thu, 31 Mar 2016 00:20:15 +0200 |
| 4 | Subject: [PATCH] 3rdparty/ippicv: Use pre-downloaded ipp |
| 5 | |
| 6 | Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 7 | Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com> |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 8 | |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 9 | --- |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 10 | 3rdparty/ippicv/ippicv.cmake | 15 +-------------- |
| 11 | 1 file changed, 1 insertion(+), 14 deletions(-) |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 12 | |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 13 | diff --git a/3rdparty/ippicv/ippicv.cmake b/3rdparty/ippicv/ippicv.cmake |
Andrew Geissler | 7f40b71 | 2020-05-15 14:09:53 -0500 | [diff] [blame] | 14 | index 257af6fcc6..f88460450f 100644 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 15 | --- a/3rdparty/ippicv/ippicv.cmake |
| 16 | +++ b/3rdparty/ippicv/ippicv.cmake |
Andrew Geissler | 7f40b71 | 2020-05-15 14:09:53 -0500 | [diff] [blame] | 17 | @@ -34,18 +34,5 @@ function(download_ippicv root_var) |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 18 | endif() |
| 19 | |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 20 | set(THE_ROOT "${OpenCV_BINARY_DIR}/3rdparty/ippicv") |
| 21 | - ocv_download(FILENAME ${OPENCV_ICV_NAME} |
| 22 | - HASH ${OPENCV_ICV_HASH} |
| 23 | - URL |
| 24 | - "${OPENCV_IPPICV_URL}" |
| 25 | - "$ENV{OPENCV_IPPICV_URL}" |
| 26 | - "https://raw.githubusercontent.com/opencv/opencv_3rdparty/${IPPICV_COMMIT}/ippicv/" |
| 27 | - DESTINATION_DIR "${THE_ROOT}" |
| 28 | - ID IPPICV |
| 29 | - STATUS res |
| 30 | - UNPACK RELATIVE_URL) |
| 31 | - |
| 32 | - if(res) |
| 33 | - set(${root_var} "${THE_ROOT}/${OPENCV_ICV_PACKAGE_SUBDIR}" PARENT_SCOPE) |
| 34 | - endif() |
| 35 | + set(${root_var} "${THE_ROOT}/${OPENCV_ICV_PACKAGE_SUBDIR}" PARENT_SCOPE) |
| 36 | endfunction() |