From 028737478b0b099c1596b99f21da82cc77d63fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tuomas=20J=C3=A4rvinen?= Date: Mon, 20 May 2024 17:05:38 +0200 Subject: [PATCH] Removed problematic cmake script and improved qmake script. There was some issues in cmake build. For some reason it doesn't handle QObjects properly and are so causing issues with telemetry signals. Modified qmake script to use user compiled MAVSDK installed to /usr/local/ Type: Improvement --- src/CMakeLists.txt | 18 ------------------ src/autopilot.pro | 6 ++++-- 2 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 src/CMakeLists.txt diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt deleted file mode 100644 index 153601b..0000000 --- a/src/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -cmake_minimum_required(VERSION 3.0.0) -project(autopilot) - -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_AUTOMOC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -find_package(MAVSDK REQUIRED) -find_package(Qt5Core REQUIRED) - -include_directories(/usr/include/mavsdk) - -set(SOURCE_FILES az_action_point.cpp az_coordinate.cpp az_drone_controller.cpp az_mission_controller.cpp az_mission.cpp az_utils.cpp main.cpp) -set(HEADER_FILES az_action_point.h az_config.h az_coordinate.h az_drone_controller.h az_mission_controller.h az_mission.h az_utils.h) - -add_executable(autopilot ${SOURCE_FILES} ${HEADER_FILES}) -target_link_libraries(autopilot Qt5::Core MAVSDK::mavsdk) - diff --git a/src/autopilot.pro b/src/autopilot.pro index 03f2255..a67bd28 100644 --- a/src/autopilot.pro +++ b/src/autopilot.pro @@ -1,11 +1,13 @@ QT = core CONFIG += c++17 cmdline +# Reduce compiler warnings from the ArduPilot headers QMAKE_CXXFLAGS += -Wno-address-of-packed-member # MAVSDK pkg-config file is garbage. Add dependency manually -INCLUDEPATH += /usr/include/mavsdk -LIBS += /usr/lib/libmavsdk.so.2 +QMAKE_RPATHDIR += /usr/local/lib +INCLUDEPATH += /usr/local/include/mavsdk +LIBS += /usr/local/lib/libmavsdk.so SOURCES += \ az_action_point.cpp \