Fix vcpkg on MacOS

Author: k3DW

.github/actions/common-macos/action.yml

@@ -5,6 +5,8 @@ inputs:
     required: true
   build-preset:
     required: true
+  vcpkg-triplet:
+    required: true
 
 runs:
   using: "composite"
@@ -17,7 +19,7 @@ runs:
       run: |
         cmake --preset ${{ inputs.config-preset }} \
               -G Xcode \
-              -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
+              -DVCPKG_TARGET_TRIPLET=${{ vcpkg-triplet }} \
               -DCMAKE_OSX_DEPLOYMENT_TARGET=11.6
       shell: bash
 

.github/workflows/build.yml

@@ -13,8 +13,9 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
-  
-      - uses: ./.github/actions/common-windows
+
+      - name: Configure and build
+        uses: ./.github/actions/common-windows
         with:
           config-preset: Release
           build-preset: Release
@@ -36,19 +37,34 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
-  
-      - uses: ./.github/actions/common-macos
+
+      - name: Configure and build x64
+        uses: ./.github/actions/common-macos
         with:
           config-preset: Release
           build-preset: Release
+          vcpkg-triplet: x64-osx
+
+      - name: Configure and build arm64
+        uses: ./.github/actions/common-macos
+        with:
+          config-preset: Debug
+          build-preset: Tests
+          vcpkg-triplet: arm64-osx
+
+      - name: Merge binaries
+        run: |
+          cp -R ./bin/x86_x64/Release/PartStackerGUI.app ./bin/universal/Release/PartStackerGUI.app
+          lipo -create \
+            ./bin/x86_x64/Release/PartStackerGUI.app/Contents/MacOS/PartStackerGUI \
+            ./bin/arm64/Release/PartStackerGUI.app/Contents/MacOS/PartStackerGUI \
+            -output ./bin/universal/Release/PartStackerGUI.app/Contents/MacOS/PartStackerGUI
 
       - name: Package into DMG
         run: |
-          mkdir -p ./bin/Release/dmg-root
-          mv ./bin/Release/PartStackerGUI.app ./bin/Release/dmg-root/
           hdiutil create \
             -volname "PartStackerGUI" \
-            -srcfolder ./bin/Release/dmg-root \
+            -srcfolder ./bin/universal/Release \
             -format UDZO \
             ./bin/Release/PartStackerGUI-mac.dmg
 

.github/workflows/test.yml

@@ -10,8 +10,9 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
-  
-      - uses: ./.github/actions/common-windows
+
+      - name: Configure and build
+        uses: ./.github/actions/common-windows
         with:
           config-preset: Debug
           build-preset: Tests
@@ -28,11 +29,13 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
-  
-      - uses: ./.github/actions/common-macos
+
+      - name: Configure and build
+        uses: ./.github/actions/common-macos
         with:
           config-preset: Debug
           build-preset: Tests
+          vcpkg-triplet: arm64-osx
 
       - name: Run Tests
         run: |

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.30)
 if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
     set(VCPKG_TARGET_TRIPLET "x64-windows-static-md" CACHE STRING "" FORCE)
 elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
-    set(VCPKG_TARGET_TRIPLET "x64-osx" CACHE STRING "" FORCE)
+    set(VCPKG_TARGET_TRIPLET "arm64-osx" CACHE STRING "" FORCE)
 else()
     message(FATAL_ERROR "Unsupported platform: ${CMAKE_HOST_SYSTEM_NAME}")
 endif()

src/pstack/gui/CMakeLists.txt

@@ -39,5 +39,5 @@ set(PSTACK_OUTPUT_FILE_NAME "PartStackerGUI")
 pstack_configure_target_info(pstack_gui)
 set_target_properties(pstack_gui PROPERTIES
     OUTPUT_NAME ${PSTACK_OUTPUT_FILE_NAME}
-    RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/bin"
+    RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/${CMAKE_OSX_ARCHITECTURES}/bin"
 )