summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-support/opencv/opencv_3.1.bb11
1 files changed, 6 insertions, 5 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb
index da1131616b..2136b0747a 100644
--- a/meta-oe/recipes-support/opencv/opencv_3.1.bb
+++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb
@@ -116,15 +116,14 @@ PACKAGES_DYNAMIC += "^libopencv-.*"
116 116
117FILES_${PN} = "" 117FILES_${PN} = ""
118FILES_${PN}-apps = "${bindir}/* ${datadir}/OpenCV" 118FILES_${PN}-apps = "${bindir}/* ${datadir}/OpenCV"
119FILES_${PN}-dbg += "${libdir}/.debug" 119FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig ${datadir}/OpenCV/*.cmake ${datadir}/OpenCV/3rdparty/lib/*.a"
120FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig"
121FILES_${PN}-doc = "${datadir}/OpenCV/doc" 120FILES_${PN}-doc = "${datadir}/OpenCV/doc"
122FILES_${PN}-java = "${datadir}/OpenCV/java" 121FILES_${PN}-java = "${datadir}/OpenCV/java"
123FILES_${PN}-java-dbg = "${datadir}/OpenCV/java/.debug/" 122FILES_${PN}-java-dbg = "${datadir}/OpenCV/java/.debug/"
124FILES_${PN}-samples = "${datadir}/OpenCV/samples/" 123FILES_${PN}-samples = "${datadir}/OpenCV/samples/"
125FILES_${PN}-samples-dbg = "${datadir}/OpenCV/samples/bin/.debug" 124FILES_${PN}-samples-dbg = "${datadir}/OpenCV/samples/bin/.debug"
126 125
127INSANE_SKIP_${PN}-apps = "staticdev" 126INSANE_SKIP_${PN}-dev = "staticdev"
128INSANE_SKIP_${PN}-java = "libdir" 127INSANE_SKIP_${PN}-java = "libdir"
129INSANE_SKIP_${PN}-java-dbg = "libdir" 128INSANE_SKIP_${PN}-java-dbg = "libdir"
130 129
@@ -144,6 +143,8 @@ do_install_append() {
144 rm -rf ${D}/usr/lib 143 rm -rf ${D}/usr/lib
145 fi 144 fi
146 145
147 install -d ${D}${datadir}/OpenCV/samples/bin/ 146 if ${@bb.utils.contains("PACKAGECONFIG", "samples", "true", "false", d)}; then
148 cp -f bin/*-tutorial-* bin/*-example-* ${D}${datadir}/OpenCV/samples/bin/ 147 install -d ${D}${datadir}/OpenCV/samples/bin/
148 cp -f bin/*-tutorial-* bin/*-example-* ${D}${datadir}/OpenCV/samples/bin/
149 fi
149} 150}