qextserialport: allow building with Qt5

qextserialport builds fine with both Qt4 and Qt5, so this commit
enables it for Qt5.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Thomas Petazzoni 2014-11-01 23:15:11 +01:00 committed by Peter Korsgaard
parent b8eaeaec8c
commit 79d4063d78
2 changed files with 9 additions and 5 deletions

View File

@ -1,8 +1,6 @@
config BR2_PACKAGE_QEXTSERIALPORT config BR2_PACKAGE_QEXTSERIALPORT
bool "qextserialport" bool "qextserialport"
# Qt is a big library, we don't want to select it depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5
# automatically without the user knowing
depends on BR2_PACKAGE_QT
help help
A Qt library to manage serial ports A Qt library to manage serial ports

View File

@ -10,13 +10,19 @@ QEXTSERIALPORT_SITE_METHOD = git
QEXTSERIALPORT_LICENSE = MIT QEXTSERIALPORT_LICENSE = MIT
QEXTSERIALPORT_DEPENDENCIES = qt
QEXTSERIALPORT_INSTALL_STAGING = YES QEXTSERIALPORT_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_QT),y)
QEXTSERIALPORT_DEPENDENCIES += qt
define QEXTSERIALPORT_CONFIGURE_CMDS define QEXTSERIALPORT_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) $(QT_QMAKE)) (cd $(@D); $(TARGET_MAKE_ENV) $(QT_QMAKE))
endef endef
else ifeq ($(BR2_PACKAGE_QT5),y)
QEXTSERIALPORT_DEPENDENCIES += qt5base
define QEXTSERIALPORT_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE))
endef
endif
define QEXTSERIALPORT_BUILD_CMDS define QEXTSERIALPORT_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)