opencv: sort and reorder CMake configuration flags

To make easier future package update.

Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk
index d56b5e4bc012a19922f036bf45ceb832a74cecbb..5d83074ea5c81efadf8d27733bc1b011d0e3689b 100644 (file)
--- a/package/opencv/opencv.mk
+++ b/package/opencv/opencv.mk
@@ -10,24 +10,35 @@ OPENCV_INSTALL_STAGING = YES
 OPENCV_LICENSE = BSD-3c
 OPENCV_LICENSE_FILES = doc/license.txt
 
+# OpenCV component options
 OPENCV_CONF_OPT += \
-       -DBUILD_WITH_STATIC_CRT=OFF                                  \
-       -DBUILD_DOCS=OFF                                             \
-       -DBUILD_EXAMPLES=OFF                                         \
-       -DBUILD_PACKAGE=OFF                                          \
-       -DBUILD_TESTS=$(if $(BR2_PACKAGE_OPENCV_BUILD_TESTS),ON,OFF) \
+       -DBUILD_WITH_DEBUG_INFO=OFF \
+       -DBUILD_DOCS=OFF            \
+       -DBUILD_EXAMPLES=OFF        \
        -DBUILD_PERF_TESTS=$(if $(BR2_PACKAGE_OPENCV_BUILD_PERF_TESTS),ON,OFF) \
-       -DBUILD_WITH_DEBUG_INFO=OFF             \
+       -DBUILD_TESTS=$(if $(BR2_PACKAGE_OPENCV_BUILD_TESTS),ON,OFF)
+
+# OpenCV build options
+OPENCV_CONF_OPT += \
+       -DBUILD_WITH_STATIC_CRT=OFF      \
+       -DENABLE_FAST_MATH=ON            \
+       -DENABLE_NOISY_WARNINGS=OFF      \
+       -DENABLE_OMIT_FRAME_POINTER=ON   \
+       -DENABLE_PRECOMPILED_HEADERS=OFF \
+       -DENABLE_PROFILING=OFF           \
+       -DOPENCV_CAN_BREAK_BINARY_COMPATIBILITY=ON
+
+# OpenCV link options
+OPENCV_CONF_OPT += \
        -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \
        -DCMAKE_SKIP_RPATH=OFF                  \
-       -DCMAKE_USE_RELATIVE_PATHS=OFF          \
-       -DENABLE_FAST_MATH=ON                   \
-       -DENABLE_NOISY_WARNINGS=OFF             \
-       -DENABLE_OMIT_FRAME_POINTER=ON          \
-       -DENABLE_PRECOMPILED_HEADERS=OFF        \
-       -DENABLE_PROFILING=OFF                  \
-       -DENABLE_SOLUTION_FOLDERS=OFF           \
-       -DOPENCV_CAN_BREAK_BINARY_COMPATIBILITY=ON
+       -DCMAKE_USE_RELATIVE_PATHS=OFF
+
+# OpenCV packaging options:
+OPENCV_CONF_OPT += \
+       -DBUILD_PACKAGE=OFF           \
+       -DENABLE_SOLUTION_FOLDERS=OFF \
+       -DINSTALL_CREATE_DISTRIB=OFF
 
 # OpenCV module selection
 OPENCV_CONF_OPT += \