zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

created install target for platform_sdk and updated location for qmake to locate installed files

QGC4.4
jennerl 4 years ago committed by Lorenz Meier
parent
53eff304ca
commit
c1e31eefbf
2 changed files with 14 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      QGCExternalLibs.pri
  2. 2
      QGCPostLinkCommon.pri

18
QGCExternalLibs.pri
Unescape View File

@ -246,11 +246,19 @@ contains (DEFINES, DISABLE_AIRMAP) {
!exists("$${AIRMAP_PLATFORM_SDK_PATH}/include/airmap") { !exists("$${AIRMAP_PLATFORM_SDK_PATH}/include/airmap") {
system("mkdir -p $${AIRMAP_PLATFORM_SDK_PATH}/include/airmap") system("mkdir -p $${AIRMAP_PLATFORM_SDK_PATH}/include/airmap")
} }
system("wget -q -O $${AIRMAP_PLATFORM_SDK_FILENAME} $${AIRMAP_PLATFORM_SDK_URL} && dpkg -x $${AIRMAP_PLATFORM_SDK_FILENAME} $${AIRMAP_PLATFORM_SDK_PATH}/")
system("mv $${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_PREFIX}/lib/* $${AIRMAP_PLATFORM_SDK_PATH}/linux/$${AIRMAP_QT_PATH}/") airmap_platform_sdk_install.target = install_airmap_platform_sdk
system("mv $${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_PREFIX}/include/airmap/* $${AIRMAP_PLATFORM_SDK_PATH}/include/airmap/") airmap_platform_sdk_install.depends = FORCE
system("rm -rf $${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_PREFIX}") airmap_platform_sdk_install.commands = \
system("rm $${AIRMAP_PLATFORM_SDK_FILENAME}") (wget -q -O "$${AIRMAP_PLATFORM_SDK_FILENAME} $${AIRMAP_PLATFORM_SDK_URL}" && dpkg -x "$${AIRMAP_PLATFORM_SDK_FILENAME} $${AIRMAP_PLATFORM_SDK_PATH}"/) && \
(mv "$${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_PREFIX}/lib/*" "$${AIRMAP_PLATFORM_SDK_PATH}/linux/$${AIRMAP_QT_PATH}"/) && \
(mv "$${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_PREFIX}/include/airmap/*" "$${AIRMAP_PLATFORM_SDK_PATH}/include/airmap/")
airmap_platform_sdk_install.clean_commands = \
(rm -rf "$${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_PREFIX}") && \
(rm "$${AIRMAP_PLATFORM_SDK_FILENAME}")
QMAKE_EXTRA_TARGETS += airmap_platform_sdk_install
PRE_TARGETDEPS += $$airmap_platform_sdk_install.target
exists($${AIRMAP_PLATFORM_SDK_PATH}/linux/$$AIRMAP_QT_PATH) { exists($${AIRMAP_PLATFORM_SDK_PATH}/linux/$$AIRMAP_QT_PATH) {
message("Including support for AirMap for Linux") message("Including support for AirMap for Linux")

2
QGCPostLinkCommon.pri
Unescape View File

@ -146,7 +146,7 @@ LinuxBuild {
# Airmap # Airmap
contains (DEFINES, QGC_AIRMAP_ENABLED) { contains (DEFINES, QGC_AIRMAP_ENABLED) {
QMAKE_POST_LINK += && $$QMAKE_COPY $$PWD/libs/airmapd/linux/$$AIRMAP_QT_PATH/libairmap-qt.so.0.0.1 $$DESTDIR/Qt/libs/ QMAKE_POST_LINK += && $$QMAKE_COPY $$OUT_PWD/libs/airmapd/linux/$$AIRMAP_QT_PATH/libairmap-qt.so.0.0.1 $$DESTDIR/Qt/libs/
} }
# QGroundControl start script # QGroundControl start script

Write Preview
Loading…
Cancel
Save