From 83eff71db317d0641e0f159b551e71a28282b57e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Mon, 16 Sep 2019 14:48:08 +0200 Subject: [PATCH 1/2] Update pkg-config include for libnymea-networkmanager --- nymea-networkmanager/nymea-networkmanager.pro | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/nymea-networkmanager/nymea-networkmanager.pro b/nymea-networkmanager/nymea-networkmanager.pro index 38db3c3..1bce2cd 100644 --- a/nymea-networkmanager/nymea-networkmanager.pro +++ b/nymea-networkmanager/nymea-networkmanager.pro @@ -9,10 +9,7 @@ CONFIG += console link_pkgconfig CONFIG -= app_bundle TEMPLATE = app -PKGCONFIG += libnymea-networkmanager - -INCLUDEPATH += $$top_srcdir/libnymea-networkmanager/ -LIBS += -L$$top_builddir/libnymea-networkmanager/ -lnymea-networkmanager +PKGCONFIG += nymea-networkmanager HEADERS += \ application.h \ From 293b15077a78330b53cff4ca38bdf5b02d653249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Tue, 17 Sep 2019 10:23:34 +0200 Subject: [PATCH 2/2] Update include paths to new pkgconfig --- nymea-networkmanager/bluetooth/bluetoothserver.h | 2 +- nymea-networkmanager/bluetooth/networkservice.h | 2 +- nymea-networkmanager/bluetooth/wirelessservice.h | 4 ++-- nymea-networkmanager/core.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nymea-networkmanager/bluetooth/bluetoothserver.h b/nymea-networkmanager/bluetooth/bluetoothserver.h index 7034443..c72a1e3 100644 --- a/nymea-networkmanager/bluetooth/bluetoothserver.h +++ b/nymea-networkmanager/bluetooth/bluetoothserver.h @@ -40,7 +40,7 @@ #include "networkservice.h" #include "wirelessservice.h" #include "systemservice.h" -#include "libnymea-networkmanager/networkmanager.h" +#include "nymea-networkmanager/networkmanager.h" class BluetoothServer : public QObject { diff --git a/nymea-networkmanager/bluetooth/networkservice.h b/nymea-networkmanager/bluetooth/networkservice.h index de5bcfa..8effe29 100644 --- a/nymea-networkmanager/bluetooth/networkservice.h +++ b/nymea-networkmanager/bluetooth/networkservice.h @@ -26,7 +26,7 @@ #include #include -#include "libnymea-networkmanager/networkmanager.h" +#include "nymea-networkmanager/networkmanager.h" class NetworkService : public QObject { diff --git a/nymea-networkmanager/bluetooth/wirelessservice.h b/nymea-networkmanager/bluetooth/wirelessservice.h index 9894ef9..510aca2 100644 --- a/nymea-networkmanager/bluetooth/wirelessservice.h +++ b/nymea-networkmanager/bluetooth/wirelessservice.h @@ -27,8 +27,8 @@ #include #include -#include "libnymea-networkmanager/wirelessaccesspoint.h" -#include "libnymea-networkmanager/wirelessnetworkdevice.h" +#include "nymea-networkmanager/wirelessaccesspoint.h" +#include "nymea-networkmanager/wirelessnetworkdevice.h" class WirelessService : public QObject { diff --git a/nymea-networkmanager/core.h b/nymea-networkmanager/core.h index 2fa2e25..ac7d2c4 100644 --- a/nymea-networkmanager/core.h +++ b/nymea-networkmanager/core.h @@ -26,7 +26,7 @@ #include "nymeadservice.h" #include "bluetooth/bluetoothserver.h" -#include "libnymea-networkmanager/networkmanager.h" +#include "nymea-networkmanager/networkmanager.h" class Core : public QObject {