瀏覽代碼

package/zxing-cpp: drop opencv and qt dependencies

opencv and qt handling can be dropped since switch to an active fork in
commit 456a7398316655ad0b669635f580e4887c24a700 as they are only used
when examples are enabled resulting in the following warning:

CMake Warning:
  Manually-specified variables were not used by the project:

    BUILD_DOC
    BUILD_DOCS
    BUILD_EXAMPLE
    BUILD_TEST
    BUILD_TESTING
    BUILD_TESTS
    CMAKE_DISABLE_FIND_PACKAGE_OpenCV
    CMAKE_DISABLE_FIND_PACKAGE_Qt5

While at it, also drop BUILD_EXAMPLES which is already passed by
pkg-cmake.mk

Fixes: 456a7398316655ad0b669635f580e4887c24a700

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Fabrice Fontaine 1 年之前
父節點
當前提交
fd64c544d3
共有 1 個文件被更改,包括 0 次插入26 次删除
  1. 0 26
      package/zxing-cpp/zxing-cpp.mk

+ 0 - 26
package/zxing-cpp/zxing-cpp.mk

@@ -14,23 +14,10 @@ ZXING_CPP_DEPENDENCIES = host-pkgconf stb
 ZXING_CPP_CONF_OPTS = \
 	-DBUILD_READERS=ON \
 	-DBUILD_WRITERS=ON \
-	-DBUILD_EXAMPLES=OFF \
 	-DBUILD_BLACKBOX_TESTS=OFF \
 	-DBUILD_UNIT_TESTS=OFF \
 	-DBUILD_DEPENDENCIES=LOCAL
 
-ifeq ($(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI)$(BR2_PACKAGE_OPENCV4_LIB_HIGHGUI),y)
-ifeq ($(BR2_PACKAGE_OPENCV3),y)
-ZXING_CPP_DEPENDENCIES += opencv3
-endif
-ifeq ($(BR2_PACKAGE_OPENCV4),y)
-ZXING_CPP_DEPENDENCIES += opencv4
-endif
-ZXING_CPP_CONF_OPTS += -DCMAKE_REQUIRE_FIND_PACKAGE_OpenCV=TRUE
-else
-ZXING_CPP_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_OpenCV=TRUE
-endif
-
 ifeq ($(BR2_PACKAGE_PYTHON3)$(BR2_PACKAGE_PYTHON_PYBIND),yy)
 ZXING_CPP_DEPENDENCIES += python3 python-pybind
 ZXING_CPP_CONF_OPTS += \
@@ -41,17 +28,4 @@ else
 ZXING_CPP_CONF_OPTS += -DBUILD_PYTHON_MODULE=OFF
 endif
 
-ifeq ($(BR2_PACKAGE_QT5BASE),y)
-ZXING_CPP_DEPENDENCIES += qt5base
-ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5MULTIMEDIA),yy)
-ZXING_CPP_DEPENDENCIES += qt5declarative qt5multimedia
-endif
-# Only set qt5 as required when all optional qt5 dependencies are present
-ifeq ($(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5MULTIMEDIA),yyy)
-ZXING_CPP_CONF_OPTS += -DCMAKE_REQUIRE_FIND_PACKAGE_Qt5=TRUE
-endif
-else
-ZXING_CPP_CONF_OPTS += -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=TRUE
-endif
-
 $(eval $(cmake-package))