From 796ef958629ec71ad7d0c30c15c4e38b0bba7149 Mon Sep 17 00:00:00 2001
From: Nadia Holmquist Pedersen <nadia@nhp.sh>
Date: Wed, 21 Apr 2021 23:50:32 +0200
Subject: Improve macOS bundling (#1067)

* Improve macOS bundling
* Bundle libs for macOS CI
* Add MACOS_BUILD_DMG CMake option and make the CI upload the DMG so we don't lose executable permissions.
* Manually copy plugins if macdeployqt doesn't
* Ad-hoc codesign the app
---
 .github/workflows/build-macos.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 3bcc4df..e007e13 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -26,15 +26,12 @@ jobs:
     - name: Configure
       working-directory: ${{runner.workspace}}/build
       run: |
-          export PKG_CONFIG_PATH="$(brew --prefix libarchive)/lib/pkgconfig"
-          cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DQt5_DIR=$(brew --prefix qt5)/lib/cmake/Qt5
+          cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH="$(brew --prefix qt@5);$(brew --prefix libarchive)" -DMACOS_BUNDLE_LIBS=ON -DMACOS_BUILD_DMG=ON
     - name: Make
       working-directory: ${{runner.workspace}}/build
       run: |
         make -j$(sysctl -n hw.ncpu)
-        mkdir dist
-        cp -r melonDS.app dist
     - uses: actions/upload-artifact@v1
       with:
-        name: melonDS.app
-        path: ${{runner.workspace}}/build/dist
+        name: melonDS.dmg
+        path: ${{runner.workspace}}/build/melonDS.dmg
-- 
cgit v1.2.3