aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>2017-11-08 13:10:24 +0100
committerArmin Kuster <akuster808@gmail.com>2017-11-19 13:41:58 -0800
commitf27c6ce6b9b64510587b7e759b35d71fdfd8b29d (patch)
tree4605fc16628ac1ea61c8845c38b345366d1d5226
parent0c0cc62ff06b244c72ff87bafcb98771a291ff19 (diff)
downloadmeta-openembedded-f27c6ce6b9b64510587b7e759b35d71fdfd8b29d.zip
meta-openembedded-f27c6ce6b9b64510587b7e759b35d71fdfd8b29d.tar.gz
meta-openembedded-f27c6ce6b9b64510587b7e759b35d71fdfd8b29d.tar.bz2
opencv: Update ICV variable names
Since 3.3 ICV variables have been renamed. Without this patch OpenCV configure cannot find ICV/IPP binaries. Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-support/opencv/opencv_3.3.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv_3.3.bb b/meta-oe/recipes-support/opencv/opencv_3.3.bb
index dd9e4ca..bcb17d3 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.3.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.3.bb
@@ -68,8 +68,8 @@ addtask unpack_extra after do_unpack before do_patch
EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
-DWITH_1394=OFF \
-DCMAKE_SKIP_RPATH=ON \
- -DOPENCV_ICV_PACKAGE_DOWNLOADED=${IPP_MD5} \
- -DOPENCV_ICV_PATH=${WORKDIR}/ippicv_lnx \
+ -DOPENCV_ICV_HASH=${IPP_MD5} \
+ -DIPPROOT=${WORKDIR}/ippicv_lnx \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \
${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \