From c918b71c121312595fae48f69155caae0dae2f90 Mon Sep 17 00:00:00 2001
From: jennerl <jenner@airmap.com>
Date: Tue, 23 Feb 2021 12:56:04 -0600
Subject: [PATCH] updates per PR comments

---
 QGCExternalLibs.pri   | 6 ++++--
 QGCPostLinkCommon.pri | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/QGCExternalLibs.pri b/QGCExternalLibs.pri
index b844258..3a49745 100644
--- a/QGCExternalLibs.pri
+++ b/QGCExternalLibs.pri
@@ -220,7 +220,7 @@ contains (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)")
 } 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}
     message("Including support for AirMap")
     MacBuild {
@@ -242,6 +242,8 @@ contains (DEFINES, DISABLE_AIRMAP) {
 
             airmap_platform_sdk_install.target = install_airmap_platform_sdk
             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}/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}/") && \
@@ -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/") && \
                 (rm -rf "$${AIRMAP_PLATFORM_SDK_PATH}/$${AIRMAP_PLATFORM_SDK_INSTALL_PREFIX}") && \
                 (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
             PRE_TARGETDEPS += $$airmap_platform_sdk_install.target
 
diff --git a/QGCPostLinkCommon.pri b/QGCPostLinkCommon.pri
index 65fe08a..bb15f77 100644
--- a/QGCPostLinkCommon.pri
+++ b/QGCPostLinkCommon.pri
@@ -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}
         # AirMap
         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}
         }
     }
@@ -146,7 +146,7 @@ LinuxBuild {
 
     # Airmap
     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