From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Subject: Re: [ptxdist] [PATCH 6/6] OpenCV: changed ptx/ifdef usage to ptx/onoff
Date: Mon, 6 Jan 2020 14:57:33 +0100 [thread overview]
Message-ID: <20200106135733.GL5858@pengutronix.de> (raw)
In-Reply-To: <20200102135503.9854-6-m.cichy@pengutronix.de>
On Thu, Jan 02, 2020 at 02:55:03PM +0100, Marian Cichy wrote:
> CMake switches used ptx/ifdef with an ON/OFF define, but we have
> ptx/onoff for this case. Using this to sustain uniformity.
>
> Signed-off-by: Marian Cichy <m.cichy@pengutronix.de>
Could be squashed into 3/6 to simplify things when you change that commit.
Michael
> ---
> rules/opencv.make | 32 ++++++++++++++++----------------
> 1 file changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/rules/opencv.make b/rules/opencv.make
> index c37ee5e2e..d2fb5aa44 100644
> --- a/rules/opencv.make
> +++ b/rules/opencv.make
> @@ -63,24 +63,24 @@ OPENCV_CONF_OPT := \
> -DBUILD_WITH_DYNAMIC_IPP=OFF \
> -DBUILD_ZLIB=OFF \
> -DBUILD_opencv_apps:BOOL=OFF \
> - -DBUILD_opencv_calib3d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_CALIB3D,ON,OFF) \
> + -DBUILD_opencv_calib3d:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_CALIB3D) \
> -DBUILD_opencv_core:BOOL=ON \
> - -DBUILD_opencv_dnn=$(call ptx/ifdef,PTXCONF_OPENCV_DNN,ON,OFF) \
> - -DBUILD_opencv_features2d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FEATURES2D,ON,OFF) \
> - -DBUILD_opencv_flann:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_FLANN,ON,OFF) \
> - -DBUILD_opencv_highgui:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_HIGHGUI,ON,OFF) \
> - -DBUILD_opencv_imgcodecs=$(call ptx/ifdef,PTXCONF_OPENCV_IMGCODECS,ON,OFF) \
> - -DBUILD_opencv_imgproc:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_IMGPROC,ON,OFF) \
> + -DBUILD_opencv_dnn=$(call ptx/onff,PTXCONF_OPENCV_DNN) \
> + -DBUILD_opencv_features2d:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_FEATURES2D) \
> + -DBUILD_opencv_flann:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_FLANN) \
> + -DBUILD_opencv_highgui:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_HIGHGUI) \
> + -DBUILD_opencv_imgcodecs=$(call ptx/onoff,PTXCONF_OPENCV_IMGCODECS) \
> + -DBUILD_opencv_imgproc:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_IMGPROC) \
> -DBUILD_opencv_java_bindings_generator=ON \
> -DBUILD_opencv_js=OFF \
> - -DBUILD_opencv_ml:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_ML,ON,OFF) \
> - -DBUILD_opencv_objdetect:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_OBJDETECT,ON,OFF) \
> - -DBUILD_opencv_photo:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_PHOTO,ON,OFF) \
> + -DBUILD_opencv_ml:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_ML) \
> + -DBUILD_opencv_objdetect:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_OBJDETECT) \
> + -DBUILD_opencv_photo:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_PHOTO) \
> -DBUILD_opencv_python_bindings_generator=ON \
> -DBUILD_opencv_python_tests=ON \
> - -DBUILD_opencv_stitching:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_STITCHING,ON,OFF) \
> + -DBUILD_opencv_stitching:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_STITCHING) \
> -DBUILD_opencv_ts:BOOL=OFF \
> - -DBUILD_opencv_video:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_VIDEO,ON,OFF) \
> + -DBUILD_opencv_video:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_VIDEO) \
> -DBUILD_opencv_videoio=ON \
> -DBUILD_opencv_world:BOOL=OFF \
> -DCAROTENE_NS=carotene_o4t \
> @@ -101,7 +101,7 @@ OPENCV_CONF_OPT := \
> -DENABLE_IMPL_COLLECTION=OFF \
> -DENABLE_INSTRUMENTATION=OFF \
> -DENABLE_LTO=OFF \
> - -DENABLE_NEON:BOOL=$(call ptx/ifdef,PTXCONF_ARCH_ARM_NEON,ON,OFF) \
> + -DENABLE_NEON:BOOL=$(call ptx/onoff,PTXCONF_ARCH_ARM_NEON) \
> -DENABLE_NOISY_WARNINGS=OFF \
> -DENABLE_OMIT_FRAME_POINTER=ON \
> -DENABLE_PIC=ON \
> @@ -162,7 +162,7 @@ OPENCV_CONF_OPT := \
> -DWITH_GDCM=OFF \
> -DWITH_GIGEAPI:BOOL=OFF \
> -DWITH_GPHOTO2:BOOL=OFF \
> - -DWITH_GSTREAMER:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_GSTREAMER,ON,OFF) \
> + -DWITH_GSTREAMER:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_GSTREAMER) \
> -DWITH_GTK:BOOL=OFF \
> -DWITH_GTK_2_X=OFF \
> -DWITH_HALIDE=OFF \
> @@ -178,7 +178,7 @@ OPENCV_CONF_OPT := \
> -DWITH_JPEG:BOOL=ON \
> -DWITH_LAPACK=ON \
> -DWITH_LIBREALSENSE=OFF \
> - -DWITH_LIBV4L:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_V4L_LIBV4L2,ON,OFF) \
> + -DWITH_LIBV4L:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_V4L_LIBV4L2) \
> -DWITH_MFX=OFF \
> -DWITH_NVCUVID:BOOL=OFF \
> -DWITH_OPENCL:BOOL=ON \
> @@ -200,7 +200,7 @@ OPENCV_CONF_OPT := \
> -DWITH_TBB:BOOL=OFF \
> -DWITH_TIFF:BOOL=OFF \
> -DWITH_UNICAP:BOOL=OFF \
> - -DWITH_V4L:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_V4L,ON,OFF) \
> + -DWITH_V4L:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_V4L) \
> -DWITH_VA=OFF \
> -DWITH_VA_INTEL=OFF \
> -DWITH_VULKAN=OFF \
> --
> 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 13:57 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
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 [this message]
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=20200106135733.GL5858@pengutronix.de \
--to=m.olbrich@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