blob: 4d76ad40ce1504dc82b94c4352a94893738f4476 [file] [log] [blame]
Brad Bishopd7bf8c12018-02-25 22:55:05 -05001From 4801a057730632225337d7f6d26b9335e6b9b078 Mon Sep 17 00:00:00 2001
Patrick Williamsb48b7b42016-08-17 15:04:38 -05002From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
3Date: Thu, 31 Mar 2016 00:20:15 +0200
4Subject: [PATCH] 3rdparty/ippicv: Use pre-downloaded ipp
5
6Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Brad Bishopd7bf8c12018-02-25 22:55:05 -05007Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com>
Patrick Williamsb48b7b42016-08-17 15:04:38 -05008---
Brad Bishopd7bf8c12018-02-25 22:55:05 -05009 3rdparty/ippicv/ippicv.cmake | 15 +--------------
10 1 file changed, 1 insertion(+), 14 deletions(-)
Patrick Williamsb48b7b42016-08-17 15:04:38 -050011
Brad Bishopd7bf8c12018-02-25 22:55:05 -050012diff --git a/3rdparty/ippicv/ippicv.cmake b/3rdparty/ippicv/ippicv.cmake
13index 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 Williamsb48b7b42016-08-17 15:04:38 -050017 endif()
18
Brad Bishopd7bf8c12018-02-25 22:55:05 -050019 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 Williamsb48b7b42016-08-17 15:04:38 -050036--
Brad Bishopd7bf8c12018-02-25 22:55:05 -0500372.13.4
Patrick Williamsb48b7b42016-08-17 15:04:38 -050038