Enable ARM64 & include MeshOptimizer on Mac.

mosra · Jan 4, 2024 · b05cd71 · b05cd71
1 parent d064f74
commit b05cd71
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/.github/workflows/magnum-tools.yml b/.github/workflows/magnum-tools.yml
@@ -486,7 +486,6 @@ jobs:
     runs-on: ${{ matrix.runs-on }}
     strategy:
       matrix:
-        # TODO ARM Mac in Q4 2023? https://github.com/github/roadmap/issues/528
         include:
         - os: macos11-x64
           runs-on: macos-11
@@ -516,6 +515,11 @@ jobs:
         path: magnum-plugins
         # Needed for tags :(
         fetch-depth: 0
+    - name: Fetch prebuilt meshoptimizer
+      run: |
+        cd deps
+        wget https://ci.magnum.graphics/meshoptimizer-${{ env.MESHOPTIMIZER_VERSION }}-${{ matrix.os }}.zip
+        unzip meshoptimizer-${{ env.MESHOPTIMIZER_VERSION }}-${{ matrix.os }}.zip
     - name: Fetch Basis Universal sources
       run: |
         mkdir basis-universal && cd basis-universal
@@ -528,6 +532,7 @@ jobs:
           -DCMAKE_BUILD_TYPE=Release \
           -DCMAKE_INSTALL_PREFIX=$(pwd)/../install \
           -DCMAKE_INSTALL_RPATH=@executable_path/../lib \
+          -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
           -DCORRADE_BUILD_DEPRECATED=OFF \
           -DCORRADE_WITH_TESTSUITE=OFF \
           -DCORRADE_WITH_INTERCONNECT=OFF \
@@ -541,6 +546,7 @@ jobs:
           -DCMAKE_INSTALL_PREFIX=$(pwd)/../install \
           -DCMAKE_PREFIX_PATH=$(pwd)/../deps \
           -DCMAKE_INSTALL_RPATH="@executable_path/../lib" \
+          -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
           -DMAGNUM_BUILD_DEPRECATED=OFF \
           -DMAGNUM_WITH_AUDIO=OFF \
           -DMAGNUM_WITH_GL=ON \
@@ -580,6 +586,7 @@ jobs:
           -DCMAKE_PREFIX_PATH=$(pwd)/../deps \
           `# plugins also need to look up to lib/ from lib/magnum/<interface>/` \
           -DCMAKE_INSTALL_RPATH="@executable_path/../lib;@executable_path/../.." \
+          -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
           -DBASIS_UNIVERSAL_DIR=$(pwd)/../basis-universal \
           -DMAGNUM_WITH_ASSIMPIMPORTER=OFF \
           -DMAGNUM_WITH_ASTCIMPORTER=ON \
@@ -597,7 +604,7 @@ jobs:
           -DMAGNUM_WITH_JPEGIMPORTER=OFF \
           -DMAGNUM_WITH_KTXIMAGECONVERTER=ON \
           -DMAGNUM_WITH_KTXIMPORTER=ON \
-          -DMAGNUM_WITH_MESHOPTIMIZERSCENECONVERTER=OFF \
+          -DMAGNUM_WITH_MESHOPTIMIZERSCENECONVERTER=ON \
           -DMAGNUM_WITH_MINIEXRIMAGECONVERTER=ON \
           -DMAGNUM_WITH_OPENEXRIMAGECONVERTER=OFF \
           -DMAGNUM_WITH_OPENEXRIMPORTER=OFF \