Merge pull request #36 from RoboTeamTwente/feature/macos-support

MacOS support and build improvements

CMakeLists.txt

@@ -1,38 +1,25 @@
-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")
-
-# for MacOS X or iOS, watchOS, tvOS (since 3.10.3)
-if(APPLE)
-    set(Qt5Network_DIR "/usr/local/opt/qt/lib/cmake/Qt5Network")
-endif()
-
-# 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
         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
         )

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 {