On Tue, Jan 28, 2020 at 05:36:17PM +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.ci...@pengutronix.de> > --- > rules/opencv.make | 32 ++++++++++++++++---------------- > 1 file changed, 16 insertions(+), 16 deletions(-) > > diff --git a/rules/opencv.make b/rules/opencv.make > index 9ec11dc51..50bcd5997 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) \
Typo: ptx/onff -> ptx/onoff Michael > + -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 > -- 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
