From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Marian Cichy <m.cichy@pengutronix.de>
Subject: Re: [ptxdist] [PATCH 2/6] OpenCV: Added flag to build and integrate Examples
Date: Mon, 6 Jan 2020 12:32:21 +0100 [thread overview]
Message-ID: <20200106113221.GJ5858@pengutronix.de> (raw)
In-Reply-To: <20200102135503.9854-2-m.cichy@pengutronix.de>
On Thu, Jan 02, 2020 at 02:54:59PM +0100, Marian Cichy wrote:
> Signed-off-by: Marian Cichy <m.cichy@pengutronix.de>
> ---
> rules/opencv.in | 5 +++++
> rules/opencv.make | 22 ++++++++++++++++++++--
> 2 files changed, 25 insertions(+), 2 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..fc6243753 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,22 @@ 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:
> +
> +
No empty lines here.
> + @$(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 -m 755 "$$file" $(OPENCV_PKGDIR)/usr/share/opencv/examples; \
@find ... \
install -v -m755 ...
> + done
> +endif
> + @$(call touch)
> +
> # ----------------------------------------------------------------------------
> # Target-Install
> # ----------------------------------------------------------------------------
> @@ -153,7 +169,9 @@ $(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, $(OPENCV_PKGDIR)/usr/share/opencv/examples, /usr/share/opencv/examples)
$(call install_tree, opencv, 0, 0, -, /usr/share/opencv/examples)
Michael
> +endif
> @$(call install_finish, opencv)
>
> @$(call touch)
> --
> 2.20.1
>
>
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2020-01-06 11:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-02 13:54 [ptxdist] [PATCH 1/6] OpenCV: Update to Version 4.1.2 Marian Cichy
2020-01-02 13:54 ` [ptxdist] [PATCH 2/6] OpenCV: Added flag to build and integrate Examples Marian Cichy
2020-01-06 11:32 ` Michael Olbrich [this message]
2020-01-02 13:55 ` [ptxdist] [PATCH 3/6] OpenCV: Clean up configure_helper output Marian Cichy
2020-01-06 13:55 ` Michael Olbrich
2020-01-02 13:55 ` [ptxdist] [PATCH 4/6] OpenCV: Changed QT-Support from 4 to 5 Marian Cichy
2020-01-02 13:55 ` [ptxdist] [PATCH 5/6] OpenCV: added switch to turn on/off DNN support Marian Cichy
2020-01-02 13:55 ` [ptxdist] [PATCH 6/6] OpenCV: changed ptx/ifdef usage to ptx/onoff Marian Cichy
2020-01-06 13:57 ` Michael Olbrich
2020-01-06 16:10 ` [ptxdist] [PATCH 1/6] OpenCV: Update to Version 4.1.2 Michael Olbrich
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=20200106113221.GJ5858@pengutronix.de \
--to=m.olbrich@pengutronix.de \
--cc=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