From aaca2ed1efbe94eed8b6060be7c2bd8391dad1d1 Mon Sep 17 00:00:00 2001 From: Alberto Nidasio <alberto.nidasio@skywarder.eu> Date: Wed, 14 Sep 2022 23:27:13 +0200 Subject: [PATCH] [SBS] Fixed MAVLink --- .gitmodules | 3 +++ CMakeLists.txt | 8 +++++++- libs/mavlink-skyward-lib | 1 + src/shared/Modules/Mavlink/mavlinkversionheader.h | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 .gitmodules create mode 160000 libs/mavlink-skyward-lib diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..75d9cb04 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "MAVLink Skyward library"] + path = libs/mavlink-skyward-lib + url = ../mavlink/mavlink-skyward-lib diff --git a/CMakeLists.txt b/CMakeLists.txt index a51f3f9a..337881b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,7 @@ # THE SOFTWARE. cmake_minimum_required(VERSION 3.16) +add_subdirectory(libs/mavlink-skyward-lib EXCLUDE_FROM_ALL) project(SkywardHub) @@ -92,4 +93,9 @@ add_executable(groundstation src/entrypoints/groundstation/main.cpp ) target_include_directories(groundstation PRIVATE src/shared) -target_link_libraries(groundstation PUBLIC Qt5::Widgets Qt5::SerialPort Qt5::PrintSupport) +target_link_libraries(groundstation PUBLIC + Qt5::Widgets + Qt5::SerialPort + Qt5::PrintSupport + Mavlink::Mavlink +) diff --git a/libs/mavlink-skyward-lib b/libs/mavlink-skyward-lib new file mode 160000 index 00000000..9befe0e2 --- /dev/null +++ b/libs/mavlink-skyward-lib @@ -0,0 +1 @@ +Subproject commit 9befe0e2e801a9d999a89a47013f773c44bf1216 diff --git a/src/shared/Modules/Mavlink/mavlinkversionheader.h b/src/shared/Modules/Mavlink/mavlinkversionheader.h index 466d8f77..3ec786b9 100644 --- a/src/shared/Modules/Mavlink/mavlinkversionheader.h +++ b/src/shared/Modules/Mavlink/mavlinkversionheader.h @@ -4,7 +4,7 @@ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wcast-align" #pragma GCC diagnostic ignored "-Waddress-of-packed-member" -#include "mavlink_skyward_lib/mavlink_lib/pyxis/mavlink.h" +#include <mavlink_lib/pyxis/mavlink.h> #pragma GCC diagnostic pop // static __attribute__((unused)) uint8_t validSysid = 171; -- GitLab