| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From 049f931207631aa54af55a2917318d032b2ef3fa Mon Sep 17 00:00:00 2001 |
| 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> |
| 7 | --- |
| 8 | 3rdparty/ippicv/downloader.cmake | 2 ++ |
| 9 | 1 file changed, 2 insertions(+) |
| 10 | |
| 11 | diff --git a/3rdparty/ippicv/downloader.cmake b/3rdparty/ippicv/downloader.cmake |
| 12 | index a6016dbe10bc..af4062c8e95e 100644 |
| 13 | --- a/3rdparty/ippicv/downloader.cmake |
| 14 | +++ b/3rdparty/ippicv/downloader.cmake |
| 15 | @@ -31,8 +31,10 @@ function(_icv_downloader) |
| 16 | return() # Not supported |
| 17 | endif() |
| 18 | |
| 19 | + if(NOT DEFINED OPENCV_ICV_PATH) |
| 20 | set(OPENCV_ICV_UNPACK_PATH "${CMAKE_CURRENT_LIST_DIR}/unpack") |
| 21 | set(OPENCV_ICV_PATH "${OPENCV_ICV_UNPACK_PATH}${OPENCV_ICV_PACKAGE_SUBDIR}") |
| 22 | + endif() |
| 23 | |
| 24 | if(DEFINED OPENCV_ICV_PACKAGE_DOWNLOADED |
| 25 | AND OPENCV_ICV_PACKAGE_DOWNLOADED STREQUAL OPENCV_ICV_PACKAGE_HASH |
| 26 | -- |
| 27 | 2.8.0.rc3 |
| 28 | |