[ptxdist] [PATCH] opencv: Use ptx/onoff

[ptxdist] [PATCH] opencv: Use ptx/onoff

[Ladislav Michl]

Use dedicated macro for CMake options.

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 rules/opencv.make | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/rules/opencv.make b/rules/opencv.make
index aba6ebe81..f0a244b97 100644
--- a/rules/opencv.make
+++ b/rules/opencv.make
@@ -65,7 +65,7 @@ OPENCV_CONF_OPT		:= \
 	-DCMAKE_VERBOSE:BOOL=OFF \
 	-DWITH_CUDA:BOOL=OFF \
 	-DWITH_EIGEN:BOOL=OFF \
-	-DENABLE_NEON:BOOL=$(call ptx/ifdef,PTXCONF_ARCH_ARM_NEON,ON,OFF) \
+	-DENABLE_NEON:BOOL=$(call ptx/onoff, PTXCONF_ARCH_ARM_NEON) \
 	-DENABLE_VFPV3:BOOL=OFF \
 	-DWITH_GIGEAPI:BOOL=OFF \
 	-DINSTALL_CREATE_DISTRIB:BOOL=OFF \
@@ -97,30 +97,30 @@ OPENCV_CONF_OPT		:= \
 	-DWITH_XIMEA:BOOL=OFF \
 	-DWITH_XINE:BOOL=OFF \
 	-DBUILD_opencv_apps:BOOL=OFF \
-	-DBUILD_opencv_calib3d:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_CALIB3D,ON,OFF) \
-	-DBUILD_opencv_contrib:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_CONTRIB,ON,OFF) \
+	-DBUILD_opencv_calib3d:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_CALIB3D) \
+	-DBUILD_opencv_contrib:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_CONTRIB) \
 	-DBUILD_opencv_core:BOOL=ON \
-	-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_gpu:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_GPU,ON,OFF) \
-	-DBUILD_opencv_highgui:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_HIGHGUI,ON,OFF) \
-	-DBUILD_opencv_imgproc:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_IMGPROC,ON,OFF) \
-	-DBUILD_opencv_legacy:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_LEGACY,ON,OFF) \
-	-DBUILD_opencv_ml:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_ML,ON,OFF) \
-	-DBUILD_opencv_nonfree:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_NONFREE,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_stitching:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_STITCHING,ON,OFF) \
-	-DBUILD_opencv_superres:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_SUPERRES,ON,OFF) \
+	-DBUILD_opencv_features2d:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_FEATURES2D) \
+	-DBUILD_opencv_flann:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_FLANN) \
+	-DBUILD_opencv_gpu:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_GPU) \
+	-DBUILD_opencv_highgui:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_HIGHGUI) \
+	-DBUILD_opencv_imgproc:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_IMGPROC) \
+	-DBUILD_opencv_legacy:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_LEGACY) \
+	-DBUILD_opencv_ml:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_ML) \
+	-DBUILD_opencv_nonfree:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_NONFREE) \
+	-DBUILD_opencv_objdetect:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_OBJDETECT) \
+	-DBUILD_opencv_photo:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_PHOTO) \
+	-DBUILD_opencv_stitching:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_STITCHING) \
+	-DBUILD_opencv_superres:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_SUPERRES) \
 	-DBUILD_opencv_ts:BOOL=OFF \
-	-DBUILD_opencv_video:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_VIDEO,ON,OFF) \
-	-DBUILD_opencv_videostab:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_VIDEOSTAB,ON,OFF) \
+	-DBUILD_opencv_video:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_VIDEO) \
+	-DBUILD_opencv_videostab:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_VIDEOSTAB) \
 	-DBUILD_opencv_world:BOOL=OFF \
-	-DWITH_GSTREAMER:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_GSTREAMER,ON,OFF) \
-	-DWITH_V4L:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_V4L,ON,OFF) \
-	-DWITH_LIBV4L:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_V4L_LIBV4L2,ON,OFF) \
+	-DWITH_GSTREAMER:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_GSTREAMER) \
+	-DWITH_V4L:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_V4L) \
+	-DWITH_LIBV4L:BOOL=$(call ptx/onoff, PTXCONF_OPENCV_V4L_LIBV4L2) \
 	-DWITH_OPENGL:BOOL=OFF \
-	-DWITH_QT:BOOL=$(call ptx/ifdef,PTXCONF_OPENCV_QT,4,OFF)
+	-DWITH_QT:BOOL=$(call ptx/ifdef, PTXCONF_OPENCV_QT,4,OFF)
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de