Merge PR #528: Properly use pkgconfig to find nymea-mqtt

2022-06-16 00:20:50 +02:00 · 2022-06-16 00:20:50 +02:00 · d44776111e
commit d44776111e
parent 79e8c52765 f6da6d47a9
3 changed files with 3 additions and 3 deletions
--- a/libnymea/network/mqtt/mqttprovider.h
+++ b/libnymea/network/mqtt/mqttprovider.h
@ -36,7 +36,7 @@

 #include "typeutils.h"
 #include "hardwareresource.h"
-#include "mqttclient.h"
+#include <mqttclient.h>

 class MqttChannel;

--- a/server/server.pro
+++ b/server/server.pro
@ -11,7 +11,7 @@ INSTALLS += target
 QT += sql xml websockets bluetooth dbus network

 CONFIG += link_pkgconfig
-PKGCONFIG += nymea-zigbee
+PKGCONFIG += nymea-zigbee nymea-mqtt

 LIBS += -L$$top_builddir/libnymea/ -lnymea \
        -L$$top_builddir/libnymea-core -lnymea-core \
--- a/tests/auto/autotests.pri
+++ b/tests/auto/autotests.pri
@ -7,7 +7,7 @@ packagesExist(Qt5SerialBus) {
    DEFINES += WITH_QTSERIALBUS
 }

-PKGCONFIG += nymea-zigbee nymea-networkmanager
+PKGCONFIG += nymea-zigbee nymea-networkmanager nymea-mqtt

 INCLUDEPATH += $$top_srcdir/libnymea \
               $$top_srcdir/libnymea-core \