ON

Signed-off-by: Cary Phillips <[email protected]>
cary-ilm · Jan 19, 2025 · ed4c761 · ed4c761
1 parent f3ceb49
commit ed4c761
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/ci_steps.yml b/.github/workflows/ci_steps.yml
@@ -83,15 +83,15 @@ jobs:
                 -DCMAKE_CXX_STANDARD=${{ inputs.cxx-standard }} \
                 -DBUILD_SHARED_LIBS=${{ inputs.BUILD_SHARED_LIBS }} \
                 -DIMATH_INSTALL_PKG_CONFIG=${{ inputs.IMATH_INSTALL_PKG_CONFIG }} \
-                -DIMATH_BUILD_APPLE_FRAMEWORKS=${{ inputs.BUILD_APPLE_FRAMEWORKS }} \
+                -DIMATH_BUILD_APPLE_FRAMEWORKS=${{ inputs.IMATH_BUILD_APPLE_FRAMEWORKS }} \
                 -DBUILD_TESTING=${{ inputs.BUILD_TESTING }} \
                 -DPYTHON=${{ inputs.python }} \
                 -DPYBIND11=${{ inputs.pybind11 }} \
                 -DCMAKE_VERBOSE_MAKEFILE=ON"
           if [ -n "${{ inputs.namespace }}" ]; then
               CMAKE_COMMAND="$CMAKE_COMMAND -DIMATH_NAMESPACE=${{ inputs.namespace }}"
           fi
-          if [ -n "${{ inputs.IMATH_BUILD_APPLE_FRAMEWORKS }}" ]; then
+          if [ "${{ inputs.IMATH_BUILD_APPLE_FRAMEWORKS }}" == "ON" ]; then
               CMAKE_COMMAND="$CMAKE_COMMAND -DCMAKE_SYSTEM_NAME=iOS"
           fi
           echo "CMAKE_COMMAND=$CMAKE_COMMAND" >> $GITHUB_ENV

diff --git a/.github/workflows/ci_workflow.yml b/.github/workflows/ci_workflow.yml
@@ -111,7 +111,7 @@ jobs:
       pybind11: ${{ matrix.pybind11 || 'OFF' }}
       BUILD_SHARED_LIBS: ${{ matrix.BUILD_SHARED_LIBS || 'ON' }}
       IMATH_INSTALL_PKG_CONFIG: ${{ matrix.IMATH_INSTALL_PKG_CONFIG || 'ON' }}
-      IMATH_BUILD_APPLE_FRAMEWORKS: ${{ matrix.IMATH_BUILD_APPLE_FRAMEWORKS || 'ON' }}
+      IMATH_BUILD_APPLE_FRAMEWORKS: ${{ matrix.IMATH_BUILD_APPLE_FRAMEWORKS || 'OFF' }}
       BUILD_TESTING: ${{ matrix.BUILD_TESTING || 'ON' }}
       validate_install: ${{ matrix.validate_install || 'ON' }}
     strategy:
@@ -134,11 +134,12 @@ jobs:
           #   IMATH_INSTALL_PKG_CONFIG: 'OFF'
           #   BUILD_TESTING: 'OFF'
 
-          # - build: 5
-          #   label: macos-13
-          #   os: macos-13
+          - build: 5
+            label: macos-13
+            os: macos-13
 
           - build: 6
+            label: apple frameworks
             IMATH_BUILD_APPLE_FRAMEWORKS: 'ON'
 
   windows: