Skip to content

Q
qgroundcontrol
Unverified Commit a43b8489 authored by Gus Grubba's avatar Gus Grubba Committed by GitHub
Browse files
Options

Merge pull request #7192 from patrickelectric/airmmap 

QGCExternalLibs: Test Qt version before adding AirMap
parents f585fd80 edd2ef28
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 13 deletions
QGCExternalLibs.pri
View file @ a43b8489
...@@ -170,20 +170,22 @@ contains (DEFINES, DISABLE_AIRMAP) { ...@@ -170,20 +170,22 @@ contains (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)")
} else { } else {
AIRMAPD_PATH = $$PWD/libs/airmapd AIRMAPD_PATH = $$PWD/libs/airmapd
MacBuild { contains(QT_VERSION, ˆ5\\.11\..*) {
exists($${AIRMAPD_PATH}/macOS/Qt.5.11.0) { MacBuild {
message("Including support for AirMap for macOS") exists($${AIRMAPD_PATH}/macOS/Qt.5.11.0) {
LIBS += -L$${AIRMAPD_PATH}/macOS/Qt.5.11.0 -lairmap-qt message("Including support for AirMap for macOS")
DEFINES += QGC_AIRMAP_ENABLED LIBS += -L$${AIRMAPD_PATH}/macOS/Qt.5.11.0 -lairmap-qt
} DEFINES += QGC_AIRMAP_ENABLED
} else:LinuxBuild { }
exists($${AIRMAPD_PATH}/linux/Qt.5.11.0) { } else:LinuxBuild {
message("Including support for AirMap for Linux") exists($${AIRMAPD_PATH}/linux/Qt.5.11.0) {
LIBS += -L$${AIRMAPD_PATH}/linux/Qt.5.11.0 -lairmap-qt message("Including support for AirMap for Linux")
DEFINES += QGC_AIRMAP_ENABLED LIBS += -L$${AIRMAPD_PATH}/linux/Qt.5.11.0 -lairmap-qt
DEFINES += QGC_AIRMAP_ENABLED
}
} else {
message("Skipping support for Airmap (unsupported platform)")
} }
} else {
message("Skipping support for Airmap (unsupported platform)")
} }
contains (DEFINES, QGC_AIRMAP_ENABLED) { contains (DEFINES, QGC_AIRMAP_ENABLED) {
INCLUDEPATH += \ INCLUDEPATH += \
......
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