mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Marian Cichy <m.cichy@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Marian Cichy <m.cichy@pengutronix.de>
Subject: [ptxdist] [PATCH v4 2/8] OpenCV: Added flag to build and integrate Examples
Date: Tue, 28 Jan 2020 17:36:13 +0100	[thread overview]
Message-ID: <20200128163619.8486-2-m.cichy@pengutronix.de> (raw)
In-Reply-To: <20200128163619.8486-1-m.cichy@pengutronix.de>

Signed-off-by: Marian Cichy <m.cichy@pengutronix.de>
---
 rules/opencv.in   | 17 +++++++++++++++++
 rules/opencv.make | 13 ++++++++++---
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/rules/opencv.in b/rules/opencv.in
index 37fd32758..e8b9e36df 100644
--- a/rules/opencv.in
+++ b/rules/opencv.in
@@ -131,4 +131,21 @@ config OPENCV_QT
 	help
 	  QT GUI Support
 
+config OPENCV_EXAMPLES
+	bool
+	prompt "Build Examples"
+	select OPENCV_IMGPROC
+	select OPENCV_FLANN
+	select OPENCV_IMGCODECS
+	select OPENCV_VIDEOIO
+	select OPENCV_HIGHGUI
+	select OPENCV_ML
+	select OPENCV_VIDEO
+	select OPENCV_OBJDETECT
+	select OPENCV_PHOTO
+	select OPENCV_FEATURES2D
+	select OPENCV_CALIB3D
+	select OPENCV_STITCHING
+	help
+	  Build the OpenCV example applications and install them into /usr/share/opencv/examples.
 endif
diff --git a/rules/opencv.make b/rules/opencv.make
index 44ee4fd0c..1d97066a1 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -39,7 +39,7 @@ OPENCV_CONF_OPT		:= \
 	-DANT_EXECUTABLE:FILEPATH= \
 	-DPYTHON_EXECUTABLE= \
 	-DBUILD_DOCS:BOOL=OFF \
-	-DBUILD_EXAMPLES:BOOL=OFF \
+	-DBUILD_EXAMPLES:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_EXAMPLES) \
 	-DBUILD_PACKAGE:BOOL=OFF \
 	-DCMAKE_BUILD_TYPE=Release \
 	-DBUILD_SHARED_LIBS:BOOL=ON \
@@ -122,6 +122,14 @@ OPENCV_CONF_OPT		:= \
 	-DWITH_OPENGL:BOOL=OFF \
 	-DWITH_QT:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_QT,4,OFF)
 
+
+OPENCV_BUILD_DIR := $(OPENCV_DIR)-build
+
+$(STATEDIR)/opencv.install:
+	@$(call targetinfo)
+	@$(call world/install, OPENCV)
+	@$(call touch)
+
 # ----------------------------------------------------------------------------
 # Target-Install
 # ----------------------------------------------------------------------------
@@ -153,9 +161,8 @@ $(STATEDIR)/opencv.targetinstall:
 
 	@$(foreach lib, $(OPENCV_LIBS-y), \
 		$(call install_lib, opencv, 0, 0, 0644, $(lib));)
-
+	@$(call install_tree, opencv, 0, 0, $(OPENCV_BUILD_DIR)/bin, /bin)
 	@$(call install_finish, opencv)
-
 	@$(call touch)
 
 # vim: syntax=make
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

  reply	other threads:[~2020-01-28 16:36 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-28 16:36 [ptxdist] [PATCH v4 1/8] OpenCV: Update to Version 4.1.2 Marian Cichy
2020-01-28 16:36 ` Marian Cichy [this message]
2020-01-31  7:15   ` [ptxdist] [PATCH v4 2/8] OpenCV: Added flag to build and integrate Examples Michael Olbrich
2020-01-28 16:36 ` [ptxdist] [PATCH v4 3/8] OpenCV: Clean up configure_helper output Marian Cichy
2020-01-28 16:36 ` [ptxdist] [PATCH v4 4/8] OpenCV: Changed QT-Support from 4 to 5 Marian Cichy
2020-01-28 16:36 ` [ptxdist] [PATCH v4 5/8] OpenCV: added switch to turn on/off DNN support Marian Cichy
2020-01-28 16:36 ` [ptxdist] [PATCH v4 6/8] OpenCV: changed ptx/ifdef usage to ptx/onoff Marian Cichy
2020-01-31  7:15   ` Michael Olbrich
2020-01-28 16:36 ` [ptxdist] [PATCH v4 7/8] OpenCV: Update to version 4.2.0 Marian Cichy
2020-01-28 16:36 ` [ptxdist] [PATCH v4 8/8] OpenCV: make build generate pkg-config file Marian Cichy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200128163619.8486-2-m.cichy@pengutronix.de \
    --to=m.cichy@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox