Merge PR #528: Properly use pkgconfig to find nymea-mqtt
This commit is contained in:
commit
d44776111e
@ -36,7 +36,7 @@
|
|||||||
|
|
||||||
#include "typeutils.h"
|
#include "typeutils.h"
|
||||||
#include "hardwareresource.h"
|
#include "hardwareresource.h"
|
||||||
#include "mqttclient.h"
|
#include <mqttclient.h>
|
||||||
|
|
||||||
class MqttChannel;
|
class MqttChannel;
|
||||||
|
|
||||||
|
|||||||
@ -11,7 +11,7 @@ INSTALLS += target
|
|||||||
QT += sql xml websockets bluetooth dbus network
|
QT += sql xml websockets bluetooth dbus network
|
||||||
|
|
||||||
CONFIG += link_pkgconfig
|
CONFIG += link_pkgconfig
|
||||||
PKGCONFIG += nymea-zigbee
|
PKGCONFIG += nymea-zigbee nymea-mqtt
|
||||||
|
|
||||||
LIBS += -L$$top_builddir/libnymea/ -lnymea \
|
LIBS += -L$$top_builddir/libnymea/ -lnymea \
|
||||||
-L$$top_builddir/libnymea-core -lnymea-core \
|
-L$$top_builddir/libnymea-core -lnymea-core \
|
||||||
|
|||||||
@ -7,7 +7,7 @@ packagesExist(Qt5SerialBus) {
|
|||||||
DEFINES += WITH_QTSERIALBUS
|
DEFINES += WITH_QTSERIALBUS
|
||||||
}
|
}
|
||||||
|
|
||||||
PKGCONFIG += nymea-zigbee nymea-networkmanager
|
PKGCONFIG += nymea-zigbee nymea-networkmanager nymea-mqtt
|
||||||
|
|
||||||
INCLUDEPATH += $$top_srcdir/libnymea \
|
INCLUDEPATH += $$top_srcdir/libnymea \
|
||||||
$$top_srcdir/libnymea-core \
|
$$top_srcdir/libnymea-core \
|
||||||
|
|||||||
Reference in New Issue
Block a user