Skip to content

Q
qgroundcontrol
Commit 29089b93 authored by Jonas Vautherin's avatar Jonas Vautherin
Browse files
Options

Bump Qt version numbers in airmap dependency

parent 512301be
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
QGCExternalLibs.pri
View file @ 29089b93
...@@ -154,15 +154,15 @@ contains (DEFINES, DISABLE_AIRMAP) { ...@@ -154,15 +154,15 @@ contains (DEFINES, DISABLE_AIRMAP) {
} else { } else {
AIRMAPD_PATH = $$PWD/libs/airmapd AIRMAPD_PATH = $$PWD/libs/airmapd
MacBuild|iOSBuild { MacBuild|iOSBuild {
exists($${AIRMAPD_PATH}/macOS/Qt.5.9) { exists($${AIRMAPD_PATH}/macOS/Qt.5.11.0) {
message("Including support for AirMap for macOS") message("Including support for AirMap for macOS")
LIBS += -L$${AIRMAPD_PATH}/macOS/Qt.5.9 -lairmap-qt LIBS += -L$${AIRMAPD_PATH}/macOS/Qt.5.11.0 -lairmap-qt
DEFINES += QGC_AIRMAP_ENABLED DEFINES += QGC_AIRMAP_ENABLED
} }
} else:LinuxBuild { } else:LinuxBuild {
exists($${AIRMAPD_PATH}/linux/Qt.5.9) { exists($${AIRMAPD_PATH}/linux/Qt.5.11.0) {
message("Including support for AirMap for Linux") message("Including support for AirMap for Linux")
LIBS += -L$${AIRMAPD_PATH}/linux/Qt.5.9 -lairmap-qt LIBS += -L$${AIRMAPD_PATH}/linux/Qt.5.11.0 -lairmap-qt
DEFINES += QGC_AIRMAP_ENABLED DEFINES += QGC_AIRMAP_ENABLED
} }
} else { } else {
......
QGCSetup.pri
View file @ 29089b93
...@@ -53,7 +53,7 @@ MacBuild { ...@@ -53,7 +53,7 @@ MacBuild {
QMAKE_POST_LINK += && install_name_tool -change "@rpath/SDL2.framework/Versions/A/SDL2" "@executable_path/../Frameworks/SDL2.framework/Versions/A/SDL2" $$DESTDIR/$${TARGET}.app/Contents/MacOS/$${TARGET} QMAKE_POST_LINK += && install_name_tool -change "@rpath/SDL2.framework/Versions/A/SDL2" "@executable_path/../Frameworks/SDL2.framework/Versions/A/SDL2" $$DESTDIR/$${TARGET}.app/Contents/MacOS/$${TARGET}
# AirMap # AirMap
contains (DEFINES, QGC_AIRMAP_ENABLED) { contains (DEFINES, QGC_AIRMAP_ENABLED) {
QMAKE_POST_LINK += && rsync -a $$BASEDIR/libs/airmapd/macOS/Qt.5.9/* $$DESTDIR/$${TARGET}.app/Contents/Frameworks/ QMAKE_POST_LINK += && rsync -a $$BASEDIR/libs/airmapd/macOS/Qt.5.11.0/* $$DESTDIR/$${TARGET}.app/Contents/Frameworks/
QMAKE_POST_LINK += && install_name_tool -change "@rpath/libairmap-qt.0.0.1.dylib" "@executable_path/../Frameworks/libairmap-qt.0.0.1.dylib" $$DESTDIR/$${TARGET}.app/Contents/MacOS/$${TARGET} QMAKE_POST_LINK += && install_name_tool -change "@rpath/libairmap-qt.0.0.1.dylib" "@executable_path/../Frameworks/libairmap-qt.0.0.1.dylib" $$DESTDIR/$${TARGET}.app/Contents/MacOS/$${TARGET}
} }
} }
...@@ -170,7 +170,7 @@ LinuxBuild { ...@@ -170,7 +170,7 @@ LinuxBuild {
# Airmap # Airmap
contains (DEFINES, QGC_AIRMAP_ENABLED) { contains (DEFINES, QGC_AIRMAP_ENABLED) {
QMAKE_POST_LINK += && $$QMAKE_COPY $$PWD/libs/airmapd/linux/Qt.5.9/libairmap-qt.so.0.0.1 $$DESTDIR/Qt/libs/ QMAKE_POST_LINK += && $$QMAKE_COPY $$PWD/libs/airmapd/linux/Qt.5.11.0/libairmap-qt.so.0.0.1 $$DESTDIR/Qt/libs/
} }
# QGroundControl start script # QGroundControl start script
......
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