mirror of
https://github.com/azaion/autopilot.git
synced 2026-04-22 23:56:33 +00:00
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
This commit is contained in:
@@ -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)
|
|
||||||
|
|
||||||
+4
-2
@@ -1,11 +1,13 @@
|
|||||||
QT = core
|
QT = core
|
||||||
CONFIG += c++17 cmdline
|
CONFIG += c++17 cmdline
|
||||||
|
|
||||||
|
# Reduce compiler warnings from the ArduPilot headers
|
||||||
QMAKE_CXXFLAGS += -Wno-address-of-packed-member
|
QMAKE_CXXFLAGS += -Wno-address-of-packed-member
|
||||||
|
|
||||||
# MAVSDK pkg-config file is garbage. Add dependency manually
|
# MAVSDK pkg-config file is garbage. Add dependency manually
|
||||||
INCLUDEPATH += /usr/include/mavsdk
|
QMAKE_RPATHDIR += /usr/local/lib
|
||||||
LIBS += /usr/lib/libmavsdk.so.2
|
INCLUDEPATH += /usr/local/include/mavsdk
|
||||||
|
LIBS += /usr/local/lib/libmavsdk.so
|
||||||
|
|
||||||
SOURCES += \
|
SOURCES += \
|
||||||
az_action_point.cpp \
|
az_action_point.cpp \
|
||||||
|
|||||||
Reference in New Issue
Block a user