Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
3e04eab0
Unverified
Commit
3e04eab0
authored
Feb 28, 2019
by
Gus Grubba
Committed by
GitHub
Feb 28, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7258 from mavlink/fixAirmapPath
Airmap path and Qt version detection
parents
8f045546
f9a72c2b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
17 deletions
+17
-17
QGCExternalLibs.pri
QGCExternalLibs.pri
+16
-16
QGCSetup.pri
QGCSetup.pri
+1
-1
libairmap-qt.0.0.1.dylib
libs/airmapd/macOS/Qt.5.11/libairmap-qt.0.0.1.dylib
+0
-0
libairmap-qt.0.dylib
libs/airmapd/macOS/Qt.5.11/libairmap-qt.0.dylib
+0
-0
libairmap-qt.dylib
libs/airmapd/macOS/Qt.5.11/libairmap-qt.dylib
+0
-0
No files found.
QGCExternalLibs.pri
View file @
3e04eab0
...
@@ -169,23 +169,23 @@ contains (DEFINES, DISABLE_AIRMAP) {
...
@@ -169,23 +169,23 @@ contains (DEFINES, DISABLE_AIRMAP) {
} 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)")
} else {
} else {
AIRMAPD_PATH = $$PWD/libs/airmapd
AIRMAPD_PATH = $$PWD/libs/airmapd
contains(QT_VERSION, ˆ5\\.11\..*) {
AIRMAP_QT_PATH = Qt.$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}
MacBuild {
message(Looking for Airmap in $$AIRMAP_QT_PATH)
exists($${AIRMAPD_PATH}/macOS/Qt.5.11.0) {
MacBuild {
message("Including support for AirMap for macOS")
exists($${AIRMAPD_PATH}/macOS/$$AIRMAP_QT_PATH) {
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/$$AIRMAP_QT_PATH -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:LinuxBuild {
exists($${AIRMAPD_PATH}/linux/$$AIRMAP_QT_PATH) {
message("Including support for AirMap for Linux")
LIBS += -L$${AIRMAPD_PATH}/linux/$$AIRMAP_QT_PATH -lairmap-qt
DEFINES += QGC_AIRMAP_ENABLED
}
} else {
message("Skipping support for Airmap (unsupported platform)")
}
}
contains (DEFINES, QGC_AIRMAP_ENABLED) {
contains (DEFINES, QGC_AIRMAP_ENABLED) {
INCLUDEPATH += \
INCLUDEPATH += \
...
...
QGCSetup.pri
View file @
3e04eab0
...
@@ -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.11.0
/* $$DESTDIR/$${TARGET}.app/Contents/Frameworks/
QMAKE_POST_LINK += && rsync -a $$BASEDIR/libs/airmapd/macOS/
$$AIRMAP_QT_PATH
/* $$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}
}
}
}
}
...
...
libs/airmapd/macOS/Qt.5.11
.0
/libairmap-qt.0.0.1.dylib
→
libs/airmapd/macOS/Qt.5.11/libairmap-qt.0.0.1.dylib
View file @
3e04eab0
File moved
libs/airmapd/macOS/Qt.5.11
.0
/libairmap-qt.0.dylib
→
libs/airmapd/macOS/Qt.5.11/libairmap-qt.0.dylib
View file @
3e04eab0
File moved
libs/airmapd/macOS/Qt.5.11
.0
/libairmap-qt.dylib
→
libs/airmapd/macOS/Qt.5.11/libairmap-qt.dylib
View file @
3e04eab0
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment