From: Marian Cichy <m.cichy@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Marian Cichy <m.cichy@pengutronix.de>
Subject: [ptxdist] [PATCH v3 6/8] OpenCV: changed ptx/ifdef usage to ptx/onoff
Date: Mon, 27 Jan 2020 10:34:36 +0100 [thread overview]
Message-ID: <20200127093438.3101-6-m.cichy@pengutronix.de> (raw)
In-Reply-To: <20200127093438.3101-1-m.cichy@pengutronix.de>
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>
---
rules/opencv.make | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/rules/opencv.make b/rules/opencv.make
index 78dc138ad..029293225 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -60,25 +60,25 @@ 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_videoio:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_VIDEOIO) \
+ -DBUILD_opencv_video:BOOL=$(call ptx/onoff,PTXCONF_OPENCV_VIDEO) \
-DBUILD_opencv_world:BOOL=OFF \
-DCAROTENE_NS=carotene_o4t \
-DCPU_BASELINE=DETECT \
@@ -95,7 +95,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 \
@@ -136,7 +136,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 \
@@ -153,7 +153,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 \
@@ -175,7 +175,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
next prev parent reply other threads:[~2020-01-27 9:34 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-27 9:34 [ptxdist] [PATCH v3 1/8] OpenCV: Update to Version 4.1.2 Marian Cichy
2020-01-27 9:34 ` [ptxdist] [PATCH v3 2/8] OpenCV: Added flag to build and integrate Examples Marian Cichy
2020-01-27 9:34 ` [ptxdist] [PATCH v3 3/8] OpenCV: Clean up configure_helper output Marian Cichy
2020-01-27 9:34 ` [ptxdist] [PATCH v3 4/8] OpenCV: Changed QT-Support from 4 to 5 Marian Cichy
2020-01-27 9:34 ` [ptxdist] [PATCH v3 5/8] OpenCV: added switch to turn on/off DNN support Marian Cichy
2020-01-27 9:34 ` Marian Cichy [this message]
2020-01-27 9:34 ` [ptxdist] [PATCH v3 7/8] OpenCV: Update to version 4.2.0 Marian Cichy
2020-01-27 9:34 ` [ptxdist] [PATCH v3 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=20200127093438.3101-6-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