Merge pull request #305 from GLVis/mac-app-fix

Fix the CMake 'install' target on macOS to sign bundled dependencies.
GLVis · Aug 7, 2024 · c8223df · c8223df
2 parents da0d756 + 99f255e
commit c8223df
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -199,15 +199,15 @@ jobs:
     - name: package binary (Windows)
       if: matrix.os == 'windows-latest'
       env:
-        GLVIS_EXPORT_NAME: glvis-${{ github.ref_name }}-${{ runner.os }}-amd64
+        GLVIS_EXPORT_NAME: glvis-${{ github.ref_name }}-${{ runner.os }}-${{ runner.arch }}
       run: |
         cd glvis/build
         Copy-Item -Path "Release" -Destination "${Env:GLVIS_EXPORT_NAME}" -Recurse
 
     - name: package binary (Mac)
       if: matrix.os == 'macos-latest'
       env:
-        GLVIS_EXPORT_NAME: glvis-${{ github.ref_name }}-${{ runner.os }}-amd64
+        GLVIS_EXPORT_NAME: glvis-${{ github.ref_name }}-${{ runner.os }}-${{ runner.arch }}
       run: |
         cd glvis/build
         make app
@@ -222,12 +222,14 @@ jobs:
         mkdir dmg_tmp
         cp -a ../install-${{ matrix.os }}/GLVis.app dmg_tmp/GLVis.app
         # Create DMG since actions/upload-artifact will clobber Unix permissions
-        hdiutil create -volname "GLVis macOS x86_64" -srcfolder dmg_tmp -ov -format UDZO GLVis.dmg
+        hdiutil create -volname "GLVis macOS arm64" -srcfolder dmg_tmp -ov -format UDZO GLVis.dmg
         mkdir ${GLVIS_EXPORT_NAME}
         cp GLVis.dmg ${GLVIS_EXPORT_NAME}
 
     - name: upload binary
       uses: actions/upload-artifact@v4
+      env:
+        GLVIS_EXPORT_NAME: glvis-${{ github.ref_name }}-${{ runner.os }}-${{ runner.arch }}
       with:
-        name: glvis-${{ github.ref_name }}-${{ runner.os }}-amd64
-        path: glvis/build/glvis-${{ github.ref_name }}-${{ runner.os }}-amd64
+        name: ${{ env.GLVIS_EXPORT_NAME }}
+        path: glvis/build/${{ env.GLVIS_EXPORT_NAME }}
diff --git a/CHANGELOG b/CHANGELOG
@@ -9,6 +9,12 @@
                              https://glvis.org
 
 
+Version 4.3.1 (development)
+===========================
+
+- Fix the Mac binary build in GitHub CI.
+
+
 Version 4.3 released on Aug 7, 2024
 ===================================
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -345,6 +345,14 @@ if(NOT EMSCRIPTEN)
     install(CODE [[
       include (BundleUtilities)
       fixup_bundle("${CMAKE_INSTALL_PREFIX}/GLVis.app" "" "")
+      file(GLOB LIBS_TO_SIGN
+          "${CMAKE_INSTALL_PREFIX}/GLVis.app/Contents/Frameworks/*.dylib")
+      foreach(LIB ${LIBS_TO_SIGN})
+        if (NOT IS_SYMLINK ${LIB})
+          execute_process(COMMAND codesign --force --sign - ${LIB})
+        endif()
+      endforeach()
+      execute_process(COMMAND codesign --force --sign - ${CMAKE_INSTALL_PREFIX}/GLVis.app)
     ]] COMPONENT RUNTIME)
   endif(APPLE)