Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From 4801a057730632225337d7f6d26b9335e6b9b078 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> |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 8 | --- |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 9 | 3rdparty/ippicv/ippicv.cmake | 15 +-------------- |
| 10 | 1 file changed, 1 insertion(+), 14 deletions(-) |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 11 | |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 12 | diff --git a/3rdparty/ippicv/ippicv.cmake b/3rdparty/ippicv/ippicv.cmake |
| 13 | index d601da4bb..f6fc1098c 100644 |
| 14 | --- a/3rdparty/ippicv/ippicv.cmake |
| 15 | +++ b/3rdparty/ippicv/ippicv.cmake |
| 16 | @@ -39,18 +39,5 @@ function(download_ippicv root_var) |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 17 | endif() |
| 18 | |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 19 | set(THE_ROOT "${OpenCV_BINARY_DIR}/3rdparty/ippicv") |
| 20 | - ocv_download(FILENAME ${OPENCV_ICV_NAME} |
| 21 | - HASH ${OPENCV_ICV_HASH} |
| 22 | - URL |
| 23 | - "${OPENCV_IPPICV_URL}" |
| 24 | - "$ENV{OPENCV_IPPICV_URL}" |
| 25 | - "https://raw.githubusercontent.com/opencv/opencv_3rdparty/${IPPICV_COMMIT}/ippicv/" |
| 26 | - DESTINATION_DIR "${THE_ROOT}" |
| 27 | - ID IPPICV |
| 28 | - STATUS res |
| 29 | - UNPACK RELATIVE_URL) |
| 30 | - |
| 31 | - if(res) |
| 32 | - set(${root_var} "${THE_ROOT}/${OPENCV_ICV_PACKAGE_SUBDIR}" PARENT_SCOPE) |
| 33 | - endif() |
| 34 | + set(${root_var} "${THE_ROOT}/${OPENCV_ICV_PACKAGE_SUBDIR}" PARENT_SCOPE) |
| 35 | endfunction() |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 36 | -- |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 37 | 2.13.4 |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 38 | |