From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: Marian Cichy Date: Thu, 23 Jan 2020 15:23:10 +0100 Message-Id: <20200123142315.10466-2-m.cichy@pengutronix.de> In-Reply-To: <20200123142315.10466-1-m.cichy@pengutronix.de> References: <20200123142315.10466-1-m.cichy@pengutronix.de> MIME-Version: 1.0 Subject: [ptxdist] [PATCH v2 2/7] OpenCV: Added flag to build and integrate Examples List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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" To: ptxdist@pengutronix.de Cc: Marian Cichy Signed-off-by: Marian Cichy --- rules/opencv.in | 5 +++++ rules/opencv.make | 21 ++++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/rules/opencv.in b/rules/opencv.in index 37fd32758..ac096d60c 100644 --- a/rules/opencv.in +++ b/rules/opencv.in @@ -131,4 +131,9 @@ config OPENCV_QT help QT GUI Support +config OPENCV_EXAMPLES + bool + prompt "Build Examples" + 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..0ae4776d2 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,20 @@ 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) +ifdef PTXCONF_OPENCV_EXAMPLES + @mkdir -p $(OPENCV_PKGDIR)/usr/share/opencv/examples + find $(OPENCV_BUILD_DIR)/bin -type f | while read file; do \ + install -v -m 755 "$$file" $(OPENCV_PKGDIR)/usr/share/opencv/examples; \ + done +endif + @$(call touch) + # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- @@ -153,9 +167,10 @@ $(STATEDIR)/opencv.targetinstall: @$(foreach lib, $(OPENCV_LIBS-y), \ $(call install_lib, opencv, 0, 0, 0644, $(lib));) - +ifdef PTXCONF_OPENCV_EXAMPLES + $(call install_tree, opencv, 0, 0, - , /usr/share/opencv/examples) +endif @$(call install_finish, opencv) - @$(call touch) # vim: syntax=make -- 2.20.1 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de