apple.20

Signed-off-by: Cary Phillips <cary@ilm.com>

Author: cary-ilm

.github/workflows/ci_steps.yml

@@ -47,6 +47,12 @@ on:
         type: string
       IMATH_BUILD_APPLE_FRAMEWORK:
         type: string
+      CMAKE_OSX_SYSROOT:
+        type: string
+      CMAKE_OSX_ARCHITECTURES:
+        type: string
+      CMAKE_SYSTEM_NAME: 
+        type: string
       IMATH_TEST_PYTHON:
         type: string
       IMATH_TEST_PYBIND11:
@@ -294,8 +300,14 @@ jobs:
               cmake_args+=("-DPYIMATH_LIB_SUFFIX=PY_${{ inputs.namespace }}")
               cmake_args+=("-DPYBINDIMATH_LIB_SUFFIX=PYBIND_${{ inputs.namespace }}")
           fi
-          if [ "${{ inputs.IMATH_BUILD_APPLE_FRAMEWORK }}" == "ON" ]; then
-              cmake_args+=("-DCMAKE_SYSTEM_NAME=iOS")
+          if [ -n "${{ inputs.CMAKE_SYSTEM_NAME }}" ]; then
+            cmake_args+=("-DCMAKE_SYSTEM_NAME=${{ inputs.CMAKE_SYSTEM_NAME }}")
+          fi
+          if [ -n "${{ inputs.CMAKE_OSX_SYSROOT }}" ]; then
+            cmake_args+=("-DCMAKE_OSX_SYSROOT=${{ inputs.CMAKE_OSX_SYSROOT }}")
+          fi
+          if [ -n "${{ inputs.CMAKE_OSX_ARCHITECTURES }}" ]; then
+            cmake_args+=("-DCMAKE_OSX_ARCHITECTURES=${{ inputs.CMAKE_OSX_ARCHITECTURES }}")
           fi
 
           quoted_args=$(printf '%q ' "${cmake_args[@]}")
@@ -613,22 +625,27 @@ jobs:
           $EXAMPLES_BUILD_DIR/bin/imath-examples.exe
         shell: msys2 {0}
 
-      - name: Examples (iOS)
+      - name: Examples (Apple Framework)
         if: inputs.namespace == '' && inputs.msystem == '' && inputs.IMATH_BUILD_APPLE_FRAMEWORK == 'ON'
         # Confirm the website examples compile on iOS
         run: |
           set -x
-          tree $INSTALL_DIR/Imath.framework
+          find $INSTALL_DIR/Imath.framework -ls
           EXAMPLES_BUILD_DIR=$WORKSPACE/_build.examples.iOS
           cmake_args=("-B" "$EXAMPLES_BUILD_DIR" "-S" "$WORKSPACE/website/examples")
           cmake_args+=("-DCMAKE_PREFIX_PATH=$INSTALL_DIR/Imath.framework")
           cmake_args+=("-DCMAKE_BUILD_TYPE=${{ inputs.build-type }}")
           cmake_args+=("-DCMAKE_CXX_STANDARD=${{ inputs.cxx-standard }}")
-          cmake_args+=("-DCMAKE_SYSTEM_NAME=iOS")
-          cmake_args+=("-DCMAKE_OSX_SYSROOT=iphoneos")
-          cmake_args+=("-DCMAKE_OSX_ARCHITECTURES=arm64")
+          if [ -n "${{ inputs.CMAKE_SYSTEM_NAME }}" ]; then
+            cmake_args+=("-DCMAKE_SYSTEM_NAME=${{ inputs.CMAKE_SYSTEM_NAME }}")
+          fi
+          if [ -n "${{ inputs.CMAKE_OSX_SYSROOT }}" ]; then
+            cmake_args+=("-DCMAKE_OSX_SYSROOT=${{ inputs.CMAKE_OSX_SYSROOT }}")
+          fi
+          if [ -n "${{ inputs.CMAKE_OSX_ARCHITECTURES }}" ]; then
+            cmake_args+=("-DCMAKE_OSX_ARCHITECTURES=${{ inputs.CMAKE_OSX_ARCHITECTURES }}")
+          fi
           quoted_args=$(printf '%q ' "${cmake_args[@]}")
           $CMAKE $quoted_args
           $CMAKE --build $EXAMPLES_BUILD_DIR --config ${{ inputs.build-type }}
-          tree $EXAMPLES_BUILD_DIR
         shell: bash

.github/workflows/ci_workflow.yml

@@ -114,6 +114,8 @@ jobs:
       IMATH_INSTALL_PKG_CONFIG: ${{ matrix.IMATH_INSTALL_PKG_CONFIG || 'ON' }}
       IMATH_INSTALL_SYM_LINK: ${{ matrix.IMATH_INSTALL_SYM_LINK || 'ON' }}
       IMATH_BUILD_APPLE_FRAMEWORK: ${{ matrix.IMATH_BUILD_APPLE_FRAMEWORK || 'OFF' }}
+      CMAKE_SYSTEM_NAME: ${{ matrix.CMAKE_SYSTEM_NAME }
+      CMAKE_OSX_ARCHITECTURES: ${{ matrix.CMAKE_OSX_ARCHITECTURES }}
       BUILD_TESTING: ${{ matrix.BUILD_TESTING || 'ON' }}
       IMATH_TEST_PYTHON: ${{ matrix.IMATH_TEST_PYTHON || 'ON' }}
       IMATH_TEST_PYBIND11: ${{ matrix.IMATH_TEST_PYBIND11 || 'ON' }}
@@ -147,12 +149,22 @@ jobs:
 #            os: macos-13
 
           - build: 6
-            label: Apple Frameworks
+            label: Apple Framework Universal2
             IMATH_BUILD_APPLE_FRAMEWORK: 'ON'
+            CMAKE_OSX_ARCHITECTURES: "x86_64;arm64"
             BUILD_TESTING: 'OFF'
-            python: 'OFF' # conan boost doesn't support iOS
-            pybind11: 'OFF' # iOS doesn't support CPython
-            cmake: 3.27
+            python: 'OFF' 
+            pybind11: 'OFF' 
+            validate_install: false
+
+          - build: 7
+            label: Apple iOS
+            IMATH_BUILD_APPLE_FRAMEWORK: 'ON'
+            CMAKE_SYSTEM_NAME: iOS
+            BUILD_TESTING: 'OFF'
+            python: 'OFF' 
+            pybind11: 'OFF' 
+            validate_install: false
 
   windows:
     if: false

src/Imath/CMakeLists.txt

@@ -154,22 +154,6 @@ if (IMATH_INSTALL)
     PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${IMATH_OUTPUT_SUBDIR}
   )
 
-#  if(APPLE AND IMATH_BUILD_APPLE_FRAMEWORK)
-#    message(STATUS "Creating Resources symlink")
-#    # Create the Resources symlink at the framework root
-#    file(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX}/Imath.framework/Versions)
-#    install(CODE "
-#      execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink 
-#        Versions/Current/Resources 
-#        '${CMAKE_INSTALL_PREFIX}/Imath.framework/Resources')
-#      execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink 
-#        '${Imath_VERSION_MAJOR}.${Imath_VERSION_MINOR}' 
-#        '${CMAKE_INSTALL_PREFIX}/Imath.framework/Versions/Current')
-#    ")
-#  else()
-#    message(STATUS "NOT Creating Resources symlink")
-#  endif()
-
   if(BUILD_SHARED_LIBS
      AND (NOT "${IMATH_LIB_SUFFIX}" STREQUAL "")
      AND IMATH_INSTALL_SYM_LINK