diff options
| author | Samuel Martin <s.martin49@gmail.com> | 2014-02-15 23:13:23 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-02-16 09:17:57 +0100 |
| commit | e78d357551f3191fee7b6bcc18dfd8514819cafb (patch) | |
| tree | 43fa92b961ff00ac4858e7b155624b9cd61e7335 | |
| parent | 40f7068f11bdb9c80b8c39cd992fdddd889a12dd (diff) | |
| download | buildroot-e78d357551f3191fee7b6bcc18dfd8514819cafb.tar.gz buildroot-e78d357551f3191fee7b6bcc18dfd8514819cafb.zip | |
opencv: always enable opencv_core module when opencv is enabled
It does not make much sense enabling opencv without its core module.
This configuration leads to build nothing (since all modules depend on
the core one), but install the configuration files (*.pc and *.cmake)
anyway.
This absurd situation may break the build-system of other packages
that would correctly find the *.pc (but does not check for the modules
they actually use), but would not build because of missing headers and
libraries.
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| -rw-r--r-- | package/opencv/Config.in | 6 | ||||
| -rw-r--r-- | package/opencv/opencv.mk | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/package/opencv/Config.in b/package/opencv/Config.in index ccde5cb349..217243d568 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -26,12 +26,6 @@ config BR2_PACKAGE_OPENCV_LIB_CONTRIB help Include opencv_contrib module into the OpenCV build. -config BR2_PACKAGE_OPENCV_LIB_CORE - bool "core" - default y - help - Include opencv_core module into the OpenCV build. - config BR2_PACKAGE_OPENCV_LIB_FEATURES2D bool "features2d" default y diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk index 732bc0cc55..42f9b0a51f 100644 --- a/package/opencv/opencv.mk +++ b/package/opencv/opencv.mk @@ -34,7 +34,7 @@ OPENCV_CONF_OPT += \ -DBUILD_opencv_androidcamera=OFF \ -DBUILD_opencv_calib3d=$(if $(BR2_PACKAGE_OPENCV_LIB_CALIB3D),ON,OFF) \ -DBUILD_opencv_contrib=$(if $(BR2_PACKAGE_OPENCV_LIB_CONTRIB),ON,OFF) \ - -DBUILD_opencv_core=$(if $(BR2_PACKAGE_OPENCV_LIB_CORE),ON,OFF) \ + -DBUILD_opencv_core=ON \ -DBUILD_opencv_features2d=$(if $(BR2_PACKAGE_OPENCV_LIB_FEATURES2D),ON,OFF) \ -DBUILD_opencv_flann=$(if $(BR2_PACKAGE_OPENCV_LIB_FLANN),ON,OFF) \ -DBUILD_opencv_gpu=$(if $(BR2_PACKAGE_OPENCV_LIB_GPU),ON,OFF) \ |
