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

updates per PR comments

QGC4.4
jennerl 4 years ago committed by Lorenz Meier
parent
11822081e3
commit
c918b71c12
2 changed files with 6 additions and 4 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. 6
      QGCExternalLibs.pri
  2. 4
      QGCPostLinkCommon.pri

6
QGCExternalLibs.pri
Unescape View File

@ -220,7 +220,7 @@ 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 {
AIRMAP_PLATFORM_SDK_PATH = $${OUT_PWD}/libs/airmapd AIRMAP_PLATFORM_SDK_PATH = $${OUT_PWD}/libs/airmap-platform-sdk
AIRMAP_QT_PATH = Qt.$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION} AIRMAP_QT_PATH = Qt.$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}
message("Including support for AirMap") message("Including support for AirMap")
MacBuild { MacBuild {
@ -242,6 +242,8 @@ contains (DEFINES, DISABLE_AIRMAP) {
airmap_platform_sdk_install.target = install_airmap_platform_sdk airmap_platform_sdk_install.target = install_airmap_platform_sdk
airmap_platform_sdk_install.commands = \ airmap_platform_sdk_install.commands = \
(rm -rf "$${AIRMAP_PLATFORM_SDK_PATH}/linux/$${AIRMAP_QT_PATH}") && \
(rm -rf "$${AIRMAP_PLATFORM_SDK_PATH}/include/airmap") && \
(mkdir -p "$${AIRMAP_PLATFORM_SDK_PATH}/linux/$${AIRMAP_QT_PATH}") && \ (mkdir -p "$${AIRMAP_PLATFORM_SDK_PATH}/linux/$${AIRMAP_QT_PATH}") && \
(mkdir -p "$${AIRMAP_PLATFORM_SDK_PATH}/include/airmap") && \ (mkdir -p "$${AIRMAP_PLATFORM_SDK_PATH}/include/airmap") && \
(wget -q -O "$${OUT_PWD}/$${AIRMAP_PLATFORM_SDK_FILENAME}" "$${AIRMAP_PLATFORM_SDK_URL}" && dpkg -x "$${AIRMAP_PLATFORM_SDK_FILENAME} $${AIRMAP_PLATFORM_SDK_PATH}/") && \ (wget -q -O "$${OUT_PWD}/$${AIRMAP_PLATFORM_SDK_FILENAME}" "$${AIRMAP_PLATFORM_SDK_URL}" && dpkg -x "$${AIRMAP_PLATFORM_SDK_FILENAME} $${AIRMAP_PLATFORM_SDK_PATH}/") && \
@ -249,7 +251,7 @@ contains (DEFINES, DISABLE_AIRMAP) {
(mv "$${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_PREFIX}/include/airmap/*" "$${AIRMAP_PLATFORM_SDK_PATH}/include/airmap/") && \ (mv "$${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_PREFIX}/include/airmap/*" "$${AIRMAP_PLATFORM_SDK_PATH}/include/airmap/") && \
(rm -rf "$${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_PREFIX}") && \ (rm -rf "$${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_PREFIX}") && \
(rm "$${AIRMAP_PLATFORM_SDK_FILENAME}") (rm "$${AIRMAP_PLATFORM_SDK_FILENAME}")
airmap_platform_sdk_install.depends = FORCE airmap_platform_sdk_install.depends = ${AIRMAP_PLATFORM_SDK_PATH}
QMAKE_EXTRA_TARGETS += airmap_platform_sdk_install QMAKE_EXTRA_TARGETS += airmap_platform_sdk_install
PRE_TARGETDEPS += $$airmap_platform_sdk_install.target PRE_TARGETDEPS += $$airmap_platform_sdk_install.target

4
QGCPostLinkCommon.pri
Unescape View File

@ -38,7 +38,7 @@ MacBuild {
QMAKE_POST_LINK += && install_name_tool -change "@rpath/SDL2.framework/Versions/A/SDL2" "@executable_path/../Frameworks/SDL2.framework/Versions/A/SDL2" $${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" $${TARGET}.app/Contents/MacOS/$${TARGET}
# AirMap # AirMap
contains (DEFINES, QGC_AIRMAP_ENABLED) { contains (DEFINES, QGC_AIRMAP_ENABLED) {
QMAKE_POST_LINK += && rsync -a $$SOURCE_DIR/libs/airmapd/macOS/$$AIRMAP_QT_PATH/* $${TARGET}.app/Contents/Frameworks/ QMAKE_POST_LINK += && rsync -a $$SOURCE_DIR/libs/airmap-platform-sdk/macOS/$$AIRMAP_QT_PATH/* $${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" $${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" $${TARGET}.app/Contents/MacOS/$${TARGET}
} }
} }
@ -146,7 +146,7 @@ LinuxBuild {
# Airmap # Airmap
contains (DEFINES, QGC_AIRMAP_ENABLED) { contains (DEFINES, QGC_AIRMAP_ENABLED) {
QMAKE_POST_LINK += && $$QMAKE_COPY $$OUT_PWD/libs/airmapd/linux/$$AIRMAP_QT_PATH/libairmap-qt.so.0.0.1 $$DESTDIR/Qt/libs/ QMAKE_POST_LINK += && $$QMAKE_COPY $$OUT_PWD/libs/airmap-platform-sdk/linux/$$AIRMAP_QT_PATH/libairmap-qt.so.0.0.1 $$DESTDIR/Qt/libs/
} }
# QGroundControl start script # QGroundControl start script

Write Preview
Loading…
Cancel
Save