macos: pack thirdparty libs to pkg

.github/workflows/build-test-macos.yml

@@ -20,7 +20,7 @@ on:
 
 jobs:
   macos-build-test:
-    timeout-minutes: 70
+    timeout-minutes: 90
     runs-on: ${{ matrix.runner }}
     strategy:
       fail-fast: false
@@ -36,14 +36,17 @@ jobs:
             runner: macos-13 # github hosted
             config: Release
             brewpath: /usr/local
+            codesign-options: "--skip-sign"
           - os: github-arm
             runner: macos-latest  # github hosted
             config: Debug
             brewpath: /opt/homebrew
+            codesign-options: "--skip-sign"
           - os: arm
             runner: macos-arm-build # self-hosted
             config: Release
             brewpath: /opt/homebrew
+            codesign-options: ""
     permissions:
       id-token: write # This is required for requesting the JWT
       contents: read  # This is required for actions/checkout
@@ -150,14 +153,19 @@ jobs:
         if: ${{ env.UPLOAD_TEST_ARTIFACTS == 'true' && env.INTERNAL_BUILD == 'true' && !cancelled() }}
         run: aws s3 cp ./pytest_temp 's3://test-artifacts-git/tests/${{github.run_id}}/macos/${{matrix.os}}' --recursive
 
-      - name: Create Pkg
-        if: ${{ inputs.UPLOAD_ARTIFACTS }}
+      - name: Create MeshLib.framework
+        if: ${{ inputs.UPLOAD_ARTIFACTS && env.INTERNAL_BUILD == 'true' && matrix.config == 'Release'}}
         run: |
-          ./scripts/distribution_apple.sh
-          mv MeshLib_.pkg meshlib_${{matrix.os}}.pkg
+          ./scripts/distribution_apple_framework.sh
+
+      - name: Codesign framework
+        if: ${{ inputs.UPLOAD_ARTIFACTS && env.INTERNAL_BUILD == 'true' && matrix.config == 'Release'}}
+        run: |
+          ./scripts/distribution_apple_pkg.sh ${{matrix.codesign-options}}
+          mv meshlib.pkg meshlib_${{matrix.os}}.pkg
 
       - name: Upload Macos Distribution
-        if: ${{ inputs.UPLOAD_ARTIFACTS }}
+        if: ${{ inputs.UPLOAD_ARTIFACTS && env.INTERNAL_BUILD == 'true'}}
         uses: actions/upload-artifact@v4
         with:
           name: Distributives_macos-${{matrix.os}}

.github/workflows/test-distribution.yml

@@ -145,8 +145,17 @@ jobs:
 
 
   macos-test:
-    runs-on: macos-13
     timeout-minutes: 30
+    runs-on: ${{ matrix.runner }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ x64, arm]
+        include:
+          - os: x64
+            runner: macos-13 # github hosted
+          - os: arm
+            runner: macos-latest  # github hosted
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -157,22 +166,31 @@ jobs:
         uses: robinraju/[email protected]
         with:
           releaseId: ${{inputs.release_id}}
-          fileName: "*x64.pkg"
+          fileName: "*${{matrix.os}}.pkg"
 
       - name: Install Pkg
-        run: |
-          sudo installer -pkg meshlib_*x64.pkg  -target /
-          xargs brew install < /Library/Frameworks/MeshLib.framework/Versions/Current/requirements/macos.txt
+        run: sudo installer -pkg meshlib_*${{matrix.os}}.pkg  -target /
 
       # [error] NSGL: Failed to find a suitable pixel format
-      #- name: Run MeshViewer
-        #if: always()
-        #run: /Library/Frameworks/MeshLib.framework/Versions/Current/bin/MeshViewer -tryHidden -noEventLoop -unloadPluginsAtEnd
+      - name: Run MeshViewer
+        if: always()
+        run: /Library/Frameworks/MeshLib.framework/Versions/Current/bin/MeshViewer -tryHidden -noEventLoop -unloadPluginsAtEnd
 
       - name: Show meshconv help
         if: always()
         run: /Library/Frameworks/MeshLib.framework/Versions/Current/bin/meshconv --help
 
+      - name: Build C examples
+        if: always()
+        working-directory: examples/c-examples
+        run: |
+          cmake -S . -B build -DCMAKE_C_COMPILER=/usr/bin/clang && \
+          cmake --build build
+
+      - name: Install MeshLib requirements
+        run: |
+          xargs brew install < /Library/Frameworks/MeshLib.framework/Versions/Current/requirements/macos.txt || true
+
       - name: Build C++ examples
         if: always()
         working-directory: examples/cpp-examples
@@ -182,10 +200,3 @@ jobs:
           cmake .. -DCMAKE_CXX_COMPILER=/usr/bin/clang++ && \
           cmake --build . && \
           ./MeshModification
-
-      - name: Build C examples
-        if: always()
-        working-directory: examples/c-examples
-        run: |
-          cmake -S . -B build -DCMAKE_C_COMPILER=/usr/bin/clang && \
-          cmake --build build

CMakeLists.txt

@@ -68,7 +68,7 @@ ENDIF()
 IF(APPLE)
   # need to hardcode some path to fix wheel (no option to pass path)
   # TODO: revise
-  set(CMAKE_INSTALL_RPATH "@loader_path;@loader_path/..;@loader_path/../lib;@loader_path/../lib/lib;@loader_path/meshlib;${MESHLIB_THIRDPARTY_ROOT_DIR}/lib;${CMAKE_BINARY_DIR}/bin")
+  set(CMAKE_INSTALL_RPATH "@loader_path/../lib;@loader_path;@loader_path/..;@loader_path/meshlib;${MESHLIB_THIRDPARTY_ROOT_DIR}/lib;${CMAKE_BINARY_DIR}/bin")
   set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 
   IF(BUILD_TESTING)

cmake/Modules/CompilerOptions.cmake

@@ -95,3 +95,7 @@ IF(MR_EMSCRIPTEN)
   # FIXME: comment required
   add_compile_definitions(EIGEN_STACK_ALLOCATION_LIMIT=0)
 ENDIF() # MR_EMSCRIPTEN
+
+IF(APPLE)
+  set(MR_MIN_BOOST_VERSION "1.86.0")
+ENDIF()