From edd2ef289ad1b8d532e7410bdc4aca27c7e75bf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Mon, 28 Jan 2019 12:55:09 -0200 Subject: [PATCH] QGCExternalLibs: Test Qt version before adding AirMap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Patrick José Pereira --- QGCExternalLibs.pri | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri index 6704d4acc..31a82d9de 100644 --- a/QGCExternalLibs.pri +++ b/QGCExternalLibs.pri @@ -153,20 +153,22 @@ contains (DEFINES, DISABLE_AIRMAP) { message("Skipping support for AirMap (manual override from user_config.pri)") } else { AIRMAPD_PATH = $$PWD/libs/airmapd - MacBuild { - exists($${AIRMAPD_PATH}/macOS/Qt.5.11.0) { - message("Including support for AirMap for macOS") - 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) { - message("Including support for AirMap for Linux") - LIBS += -L$${AIRMAPD_PATH}/linux/Qt.5.11.0 -lairmap-qt - DEFINES += QGC_AIRMAP_ENABLED + contains(QT_VERSION, ˆ5\\.11\..*) { + MacBuild { + exists($${AIRMAPD_PATH}/macOS/Qt.5.11.0) { + message("Including support for AirMap for macOS") + 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) { + message("Including support for AirMap for Linux") + 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) { INCLUDEPATH += \ -- 2.22.0