diff options
Diffstat (limited to 'package/opencv3/opencv3.mk')
-rw-r--r-- | package/opencv3/opencv3.mk | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk index 978f38c143..3a2594b584 100644 --- a/package/opencv3/opencv3.mk +++ b/package/opencv3/opencv3.mk @@ -288,18 +288,11 @@ else OPENCV3_CONF_OPTS += -DWITH_PNG=OFF endif -ifeq ($(BR2_PACKAGE_OPENCV3_WITH_QT)$(BR2_PACKAGE_OPENCV3_WITH_QT5),) -OPENCV3_CONF_OPTS += -DWITH_QT=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV3_WITH_QT),y) -OPENCV3_CONF_OPTS += -DWITH_QT=4 -OPENCV3_DEPENDENCIES += qt -endif - ifeq ($(BR2_PACKAGE_OPENCV3_WITH_QT5),y) OPENCV3_CONF_OPTS += -DWITH_QT=5 OPENCV3_DEPENDENCIES += qt5base +else +OPENCV3_CONF_OPTS += -DWITH_QT=OFF endif ifeq ($(BR2_PACKAGE_OPENCV3_WITH_TIFF),y) |