From 5ec9903b922d10aadc0eedf1fdd237a59cb884dc Mon Sep 17 00:00:00 2001
From: Dawid Kulikowski <d.kulikowski@me.com>
Date: Sun, 25 Jul 2021 18:03:35 +0200
Subject: [PATCH 1/2] Simplify Qt5 autodiscovery

---
 CMakeLists.txt | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32193e0..1ab3ee3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,17 +6,9 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
 
 set(CMAKE_CXX_FLAGS "-std=c++17 ${CMAKE_CXX_FLAGS} -O3")
 
-# for MacOS X or iOS, watchOS, tvOS (since 3.10.3)
-if(APPLE)
-    set(Qt5Network_DIR "/usr/local/opt/qt/lib/cmake/Qt5Network")
-endif()
+include(LocateQt5)
 
-# for Linux, BSD, Solaris, Minix
-if(UNIX AND NOT APPLE)
-    SET(Qt5Network_DIR "/usr/include/x86_64-linux-gnu/qt5/Qt5Network")
-endif()
-
-find_package(Qt5Network REQUIRED)
+find_package(Qt5 COMPONENTS Network REQUIRED)
 
 add_executable(roboteam_robothub
         src/packing.cpp

From ca276eb9684ca42e7cd3e2d45079dc3a76d8f540 Mon Sep 17 00:00:00 2001
From: Dawid Kulikowski <d.kulikowski@me.com>
Date: Mon, 26 Jul 2021 17:15:59 +0200
Subject: [PATCH 2/2] Refactor CMake files, fix includes, add new method of
 resolving dependencies and update them

---
 CMakeLists.txt                       | 19 +++++++------------
 include/roboteam_robothub/RobotHub.h | 11 ++++++-----
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ab3ee3..fc3d9f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,13 +1,6 @@
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.16)
 project(roboteam_robothub)
 
-# Needed for the documentation generator.
-set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
-
-set(CMAKE_CXX_FLAGS "-std=c++17 ${CMAKE_CXX_FLAGS} -O3")
-
-include(LocateQt5)
-
 find_package(Qt5 COMPONENTS Network REQUIRED)
 
 add_executable(roboteam_robothub
@@ -15,16 +8,18 @@ add_executable(roboteam_robothub
         src/GRSim.cpp
         src/SerialDeviceManager.cpp
         src/RobotHub.cpp
-        src/main.cpp src/SSLSimulator.cpp include/roboteam_robothub/SSLSimulator.h)
+        src/main.cpp
+        src/SSLSimulator.cpp
+        )
 
 
 target_include_directories(roboteam_robothub
-        INTERFACE include
         PRIVATE include/roboteam_robothub
-        PRIVATE src )
+        INTERFACE include
+        )
 
 target_link_libraries(roboteam_robothub
-        PUBLIC roboteam_proto
+        PRIVATE roboteam_proto
         PRIVATE roboteam_utils
         PRIVATE Qt5::Network
         )
diff --git a/include/roboteam_robothub/RobotHub.h b/include/roboteam_robothub/RobotHub.h
index 5f060cc..4e27acd 100644
--- a/include/roboteam_robothub/RobotHub.h
+++ b/include/roboteam_robothub/RobotHub.h
@@ -5,16 +5,17 @@
 #ifndef ROBOTEAM_ROBOTHUB_APPLICATION_H
 #define ROBOTEAM_ROBOTHUB_APPLICATION_H
 
-#include <Publisher.h>
-#include <Subscriber.h>
-#include <string>
-#include <roboteam_proto/RobotData.pb.h>
+#include <networking/Publisher.h>
+#include <networking/Subscriber.h>
 #include <roboteam_proto/AICommand.pb.h>
+#include <roboteam_proto/RobotData.pb.h>
 #include <roboteam_proto/Setting.pb.h>
 
+#include <string>
+
+#include "SSLSimulator.h"
 #include "constants.h"
 #include "utilities.h"
-#include "SSLSimulator.h"
 
 namespace rtt::robothub {