Commit 01ac7e82 authored by Gus Grubba's avatar Gus Grubba

Check if boost is present before including AirMap

This is temporary until we get rid of it
parent 70483650
...@@ -130,25 +130,27 @@ contains (DEFINES, DISABLE_ZEROCONF) { ...@@ -130,25 +130,27 @@ contains (DEFINES, DISABLE_ZEROCONF) {
# #
contains (DEFINES, DISABLE_AIRMAP) { contains (DEFINES, DISABLE_AIRMAP) {
message("Skipping support for AirMap (manual override from command line)") message("Skipping support for AirMap (manual override from command line)")
DEFINES -= QGC_AIRMAP_ENABLED
# Otherwise the user can still disable this feature in the user_config.pri file. # Otherwise the user can still disable this feature in the user_config.pri file.
} else:exists(user_config.pri):infile(user_config.pri, DEFINES, DISABLE_AIRMAP) { } else:exists(user_config.pri):infile(user_config.pri, DEFINES, DISABLE_AIRMAP) {
message("Skipping support for AirMap (manual override from user_config.pri)") message("Skipping support for AirMap (manual override from user_config.pri)")
DEFINES -= QGC_AIRMAP_ENABLED
} else { } else {
AIRMAPD_PATH = $$PWD/libs/airmapd AIRMAPD_PATH = $$PWD/libs/airmapd
MacBuild|iOSBuild { # Temporary until we get rid of boost
exists($${AIRMAPD_PATH}/macOS/Qt.5.9) { exists($${AIRMAPD_PATH}/include/boost) {
message("Including support for AirMap for macOS") MacBuild|iOSBuild {
LIBS += -L$${AIRMAPD_PATH}/macOS/Qt.5.9 -lairmap-qt exists($${AIRMAPD_PATH}/macOS/Qt.5.9) {
DEFINES += QGC_AIRMAP_ENABLED message("Including support for AirMap for macOS")
LIBS += -L$${AIRMAPD_PATH}/macOS/Qt.5.9 -lairmap-qt
DEFINES += QGC_AIRMAP_ENABLED
}
} else {
message("Skipping support for Airmap (unsupported platform)")
}
contains (DEFINES, QGC_AIRMAP_ENABLED) {
INCLUDEPATH += \
$${AIRMAPD_PATH}/include
} }
} else { } else {
message("Skipping support for Airmap (unsupported platform)") message("Missing boost for AirMap. Excluding AirMap support")
DEFINES -= QGC_AIRMAP_ENABLED
}
contains (DEFINES, QGC_AIRMAP_ENABLED) {
INCLUDEPATH += \
$${AIRMAPD_PATH}/include
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment