From 7a152541e86610223db822f9bad8d7084246ffb9 Mon Sep 17 00:00:00 2001
From: Matthias Straka <mstraka84@gmail.com>
Date: Thu, 31 Aug 2023 11:20:27 +0200
Subject: [PATCH] fix missing mqttpp lib

---
 .github/workflows/ubuntu.yml                    |  2 +-
 mqtt-plugin/include/Service.h                   | 14 +++++++-------
 mqtt-plugin/include/subscription/Channel.h      |  5 ++---
 mqtt-plugin/include/subscription/Subscription.h | 16 ++++++++--------
 4 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 0a64b00..832fdd7 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -19,7 +19,7 @@ jobs:
         submodules: true
 
     - name: Install dev requirements
-      run: sudo apt install -yq libfmt-dev libpaho-mqtt-dev qtbase5-dev
+      run: sudo apt install -yq libfmt-dev libpaho-mqtt-dev libpaho-mqttpp-dev qtbase5-dev
 
     - name: Configure CMake
       run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_CXX_COMPILER=g++ -DBUILD_PLUGIN_WITH_TESTS=OFF
diff --git a/mqtt-plugin/include/Service.h b/mqtt-plugin/include/Service.h
index 1469f65..40c638a 100644
--- a/mqtt-plugin/include/Service.h
+++ b/mqtt-plugin/include/Service.h
@@ -1,19 +1,19 @@
 #pragma once
 
-//
-#include <memory>
-#include <functional>
-#include <mutex>
-
 //
 #include "configuration/Server.h"
 #include "subscription/Subscription.h"
 #include "publish/Publish.h"
 #include "Types.h"
-#include "fmt/core.h"
 
 //
-#include "mqtt/async_client.h"
+#include <fmt/core.h>
+#include <mqtt/async_client.h>
+
+//
+#include <memory>
+#include <functional>
+#include <mutex>
 
 namespace plugin::mqtt
 {
diff --git a/mqtt-plugin/include/subscription/Channel.h b/mqtt-plugin/include/subscription/Channel.h
index 36a12a8..b59a612 100644
--- a/mqtt-plugin/include/subscription/Channel.h
+++ b/mqtt-plugin/include/subscription/Channel.h
@@ -4,13 +4,12 @@
 #include "Types.h"
 #include "subscription/decoding/Decoder.h"
 
+#include <mqtt/message.h>
+
 //
 #include <memory>
 #include <vector>
 
-//
-#include "mqtt/message.h"
-
 namespace plugin::mqtt
 {
     using namespace ::mqtt;
diff --git a/mqtt-plugin/include/subscription/Subscription.h b/mqtt-plugin/include/subscription/Subscription.h
index eaeb2a4..b1140ed 100644
--- a/mqtt-plugin/include/subscription/Subscription.h
+++ b/mqtt-plugin/include/subscription/Subscription.h
@@ -1,19 +1,19 @@
 #pragma once
 
-//
-#include <map>
-#include <vector>
-#include <functional>
-#include <string>
-#include <optional>
-
 //
 #include "Types.h"
 #include "subscription/Channel.h"
 #include "subscription/decoding/Decoder.h"
 
 //
-#include "mqtt/message.h"
+#include <mqtt/message.h>
+
+//
+#include <map>
+#include <vector>
+#include <functional>
+#include <string>
+#include <optional>
 
 namespace plugin::mqtt
 {