Merge pull request mavlink#5385 from mavlink/macRelocation

Deal with macdeployqt relocation issues
yukun2016 · Jul 2, 2017 · 851aeb3 · 851aeb3
2 parents 1b4c8d8 + e9fc0bb
commit 851aeb3
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/QGCInstaller.pri b/QGCInstaller.pri
@@ -28,6 +28,9 @@ installer {
         # links to plugins will not be created correctly.
         QMAKE_POST_LINK += && mkdir -p $${DESTDIR}/package
         QMAKE_POST_LINK += && cd $${DESTDIR} && $$dirname(QMAKE_QMAKE)/macdeployqt $${TARGET}.app -appstore-compliant -verbose=2 -qmldir=$${BASEDIR}/src
+        # macdeploy is missing some relocations once in a while. "Fix" it:
+        QMAKE_POST_LINK += && python $$BASEDIR/tools/osxrelocator.py $${TARGET}.app/Contents @rpath @executable_path/../Frameworks -r > /dev/null 2>&1
+        # Create package
         QMAKE_POST_LINK += && cd $${OUT_PWD}
         QMAKE_POST_LINK += && hdiutil create -verbose -stretch 4g -layout SPUD -srcfolder $${DESTDIR}/$${TARGET}.app -volname $${TARGET} $${DESTDIR}/package/$${TARGET}.dmg
     }