diff options
author | Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> | 2016-04-01 23:36:28 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-04-12 11:07:47 +0200 |
commit | 5abe2dcc531e597d896fb919b9e825d003c35f24 (patch) | |
tree | 1113fc224c3882e23944ae12e811436c06f2c942 /meta-oe/recipes-support/opencv/opencv | |
parent | 730d8884f37b50ce9a8369ade773cec0bba25c83 (diff) | |
download | meta-openembedded-5abe2dcc531e597d896fb919b9e825d003c35f24.tar.gz |
opencv: Use pre-downloaded ipp
We should not rely on cmake downloading ipp at configure time.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/opencv/opencv')
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch b/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch new file mode 100644 index 000000000..d568018b8 --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv/0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch | |||
@@ -0,0 +1,28 @@ | |||
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 | |||