Fix Mac CI

NOSALRO · Apr 29, 2024 · 884f006 · 884f006
1 parent 85d8d44
commit 884f006
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/ci_mac.yml b/.github/workflows/ci_mac.yml
@@ -70,7 +70,7 @@ jobs:
             brew install dartsim ;
           fi
       - name: Build Magnum
-        run: if [ "$MAGNUM_GUI" = "ON" ]; then brew install sdl2 glfw glslang eigen glm bullet assimp devil faad2 freetype glslang harfbuzz libpng libspng jpeg openexr spirv-tools zstd webp && ${{github.workspace}}/ci/install_magnum.sh /usr/local ; fi
+        run: if [ "$MAGNUM_GUI" = "ON" ]; then brew install sdl2 glfw eigen glm bullet assimp devil faad2 freetype glslang harfbuzz libpng libspng jpeg openexr spirv-tools zstd webp && ${{github.workspace}}/ci/install_magnum.sh /usr/local ; fi
       - name: Build robot_dart
         run: |
           if [ "$COMPILER" = "gcc" ]; then

diff --git a/ci/install_magnum.sh b/ci/install_magnum.sh
@@ -21,10 +21,13 @@ esac
 
 WINDOWLESS=DMAGNUM_WITH_WINDOWLESSEGLAPPLICATION
 EGLTARGET=ON
+PNGIMPORTER=ON
 
 if [ "$machine" == "Mac" ]; then
     WINDOWLESS=DMAGNUM_WITH_WINDOWLESSCGLAPPLICATION
     EGLTARGET=OFF
+    # Disable PngImporter for CI, since it is failing for libpng on Mac osx 12 and master of Magnum!
+    PNGIMPORTER=OFF
 fi
 
 mkdir -p ~/.deps
@@ -42,7 +45,7 @@ cd ../..
 git clone https://github.com/mosra/magnum.git
 cd magnum
 mkdir build && cd build
-# Ubuntu
+# Ubuntu/OSX
 cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DMAGNUM_WITH_AUDIO=ON -DMAGNUM_WITH_DEBUGTOOLS=ON -DMAGNUM_WITH_GL=ON -DMAGNUM_WITH_MESHTOOLS=ON -DMAGNUM_WITH_PRIMITIVES=ON -DMAGNUM_WITH_SCENEGRAPH=ON -DMAGNUM_WITH_SHADERS=ON -DMAGNUM_WITH_TEXT=ON -DMAGNUM_WITH_TEXTURETOOLS=ON -DMAGNUM_WITH_TRADE=ON -DMAGNUM_WITH_GLFWAPPLICATION=ON -${WINDOWLESS}=ON -DMAGNUM_WITH_OPENGLTESTER=ON -DMAGNUM_WITH_ANYAUDIOIMPORTER=ON -DMAGNUM_WITH_ANYIMAGECONVERTER=ON -DMAGNUM_WITH_ANYIMAGEIMPORTER=ON -DMAGNUM_WITH_ANYSCENEIMPORTER=ON -DMAGNUM_WITH_MAGNUMFONT=ON -DMAGNUM_WITH_OBJIMPORTER=ON -DMAGNUM_WITH_TGAIMPORTER=ON -DMAGNUM_WITH_WAVAUDIOIMPORTER=ON -DMAGNUM_TARGET_EGL=${EGLTARGET} -DCMAKE_INSTALL_PREFIX=${PREFIX} ..
 make -j
 sudo make install
@@ -52,7 +55,7 @@ cd ../..
 git clone https://github.com/mosra/magnum-plugins.git
 cd magnum-plugins
 mkdir build && cd build
-cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DMAGNUM_WITH_ASSIMPIMPORTER=ON -DMAGNUM_WITH_DDSIMPORTER=ON -DMAGNUM_WITH_JPEGIMPORTER=ON -DMAGNUM_WITH_OPENGEXIMPORTER=ON -DMAGNUM_WITH_PNGIMPORTER=ON -DMAGNUM_WITH_TINYGLTFIMPORTER=ON -DMAGNUM_WITH_STBTRUETYPEFONT=ON  -DCMAKE_INSTALL_PREFIX=${PREFIX} ..
+cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DMAGNUM_WITH_ASSIMPIMPORTER=ON -DMAGNUM_WITH_DDSIMPORTER=ON -DMAGNUM_WITH_JPEGIMPORTER=ON -DMAGNUM_WITH_OPENGEXIMPORTER=ON -DMAGNUM_WITH_PNGIMPORTER=${PNGIMPORTER} -DMAGNUM_WITH_TINYGLTFIMPORTER=ON -DMAGNUM_WITH_STBTRUETYPEFONT=ON  -DCMAKE_INSTALL_PREFIX=${PREFIX} ..
 make -j
 sudo make install
 cd ../..