blob: 5f909c1a8fa9420cc39864b09e268006c25e7495 [file] [log] [blame]
Brad Bishop26bdd442019-08-16 17:08:17 -04001From 85b882b4ceb57fe6538f47af58d0a970923fde0e 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>
Brad Bishop26bdd442019-08-16 17:08:17 -04008
Patrick Williamsb48b7b42016-08-17 15:04:38 -05009---
Brad Bishopd7bf8c12018-02-25 22:55:05 -050010 3rdparty/ippicv/ippicv.cmake | 15 +--------------
11 1 file changed, 1 insertion(+), 14 deletions(-)
Patrick Williamsb48b7b42016-08-17 15:04:38 -050012
Brad Bishopd7bf8c12018-02-25 22:55:05 -050013diff --git a/3rdparty/ippicv/ippicv.cmake b/3rdparty/ippicv/ippicv.cmake
Brad Bishop26bdd442019-08-16 17:08:17 -040014index ae8748c..305abdb 100644
Brad Bishopd7bf8c12018-02-25 22:55:05 -050015--- a/3rdparty/ippicv/ippicv.cmake
16+++ b/3rdparty/ippicv/ippicv.cmake
17@@ -39,18 +39,5 @@ function(download_ippicv root_var)
Patrick Williamsb48b7b42016-08-17 15:04:38 -050018 endif()
19
Brad Bishopd7bf8c12018-02-25 22:55:05 -050020 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()