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
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 13 deletions
QGCExternalLibs.pri
View file @ a43b8489
...@@ -170,6 +170,7 @@ contains (DEFINES, DISABLE_AIRMAP) { ...@@ -170,6 +170,7 @@ 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
contains(QT_VERSION, ˆ5\\.11\..*) {
MacBuild { MacBuild {
exists($${AIRMAPD_PATH}/macOS/Qt.5.11.0) { exists($${AIRMAPD_PATH}/macOS/Qt.5.11.0) {
message("Including support for AirMap for macOS") message("Including support for AirMap for macOS")
...@@ -185,6 +186,7 @@ contains (DEFINES, DISABLE_AIRMAP) { ...@@ -185,6 +186,7 @@ contains (DEFINES, DISABLE_AIRMAP) {
} else { } else {
message("Skipping support for Airmap (unsupported platform)") message("Skipping support for Airmap (unsupported platform)")
} }
}
contains (DEFINES, QGC_AIRMAP_ENABLED) { contains (DEFINES, QGC_AIRMAP_ENABLED) {
INCLUDEPATH += \ INCLUDEPATH += \
$${AIRMAPD_PATH}/include $${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