From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
From: Marian Cichy <m.cichy@pengutronix.de>
Date: Tue, 28 Jan 2020 17:36:13 +0100
Message-Id: <20200128163619.8486-2-m.cichy@pengutronix.de>
In-Reply-To: <20200128163619.8486-1-m.cichy@pengutronix.de>
References: <20200128163619.8486-1-m.cichy@pengutronix.de>
MIME-Version: 1.0
Subject: [ptxdist] [PATCH v4 2/8] OpenCV: Added flag to build and integrate
 Examples
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ptxdist-bounces@pengutronix.de
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Marian Cichy <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