Fixup iOS builds

Author: cboulay

.github/workflows/apple.yml

@@ -37,8 +37,8 @@ jobs:
       fail-fast: false
       matrix:
         config:
-        - {name: "macOS-latest", os: "macOS-latest", cmake_extra: "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=\"x86_64;arm64\" -DLSL_FRAMEWORK=ON" }
-        - {name: "iOS", os: "macOS-latest", cmake_extra: "-DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_DEPLOYMENT_TARGET=12.0 -DCMAKE_OSX_ARCHITECTURES=\"arm64;x86_64\" -DCMAKE_TOOLCHAIN_FILE=cmake/ios.toolchain.cmake -DLSL_FRAMEWORK=ON" }
+        - {name: "macOS-latest", os: "macOS-latest", cmake_extra: "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DLSL_UNITTESTS=ON -DLSL_BENCHMARKS=ON" }
+        - {name: "iOS", os: "macOS-latest", cmake_extra: "-DCMAKE_TOOLCHAIN_FILE=cmake/ios.toolchain.cmake -DPLATFORM=OS64" }
 
     steps:
     - uses: actions/checkout@v4
@@ -59,9 +59,9 @@ jobs:
            cmake -S . -B build \
                 -DCMAKE_BUILD_TYPE=Release \
                 -DCMAKE_INSTALL_PREFIX=${PWD}/install \
-                -DLSL_UNITTESTS=ON \
-                -DLSL_BENCHMARKS=ON \
                 -DCPACK_PACKAGE_DIRECTORY=${PWD}/package \
+                -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" \
+                -DLSL_FRAMEWORK=ON \
                 -Dlslgitrevision=${{ github.sha }} \
                 -Dlslgitbranch=${{ github.ref }} \
                 ${{ matrix.config.cmake_extra }} \
@@ -89,15 +89,25 @@ jobs:
 
     - name: Codesign
       run: |
-          codesign -vvv --force --deep --sign "$APPLE_CODE_SIGN_IDENTITY_APP" \
-            --entitlements lsl.entitlements --options runtime \
-            install/Frameworks/lsl.framework/Versions/A/lsl
-          codesign -vvv --force --deep --sign "$APPLE_CODE_SIGN_IDENTITY_APP" \
-            --entitlements lsl.entitlements --options runtime \
-            install/Frameworks/lsl.framework
-          echo "✅ Verifying binary signatures in install target..."
-          codesign -vvv --verify --deep --strict install/Frameworks/lsl.framework/Versions/A/lsl
-          codesign -vvv --verify --deep --strict install/Frameworks/lsl.framework
+          if [[ "${{ matrix.config.name }}" == "macOS-latest" ]]; then
+            codesign -vvv --force --deep --sign "$APPLE_CODE_SIGN_IDENTITY_APP" \
+              --entitlements lsl.entitlements --options runtime \
+              install/Frameworks/lsl.framework/Versions/A/lsl
+            codesign -vvv --force --deep --sign "$APPLE_CODE_SIGN_IDENTITY_APP" \
+              --entitlements lsl.entitlements --options runtime \
+              install/Frameworks/lsl.framework
+            echo "✅ Verifying binary signatures in install target..."
+            codesign -vvv --verify --deep --strict install/Frameworks/lsl.framework/Versions/A/lsl
+            codesign -vvv --verify --deep --strict install/Frameworks/lsl.framework
+          elif [[ "${{ matrix.config.name }}" == "iOS" ]]; then
+            codesign -vvv --force --deep --sign "$APPLE_CODE_SIGN_IDENTITY_APP" \
+              install/Frameworks/lsl.framework/lsl
+            codesign -vvv --force --deep --sign "$APPLE_CODE_SIGN_IDENTITY_APP" \
+              install/Frameworks/lsl.framework
+            echo "✅ Verifying binary signatures in install target..."
+            codesign -vvv --verify --deep --strict install/Frameworks/lsl.framework/lsl
+            codesign -vvv --verify --deep --strict install/Frameworks/lsl.framework
+          fi
 
     - name: upload install dir
       uses: actions/upload-artifact@v4
@@ -126,6 +136,7 @@ jobs:
     needs: build
     runs-on: macOS-latest
     steps:
+      - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4
         with:
           name: build-macOS-latest
@@ -183,13 +194,6 @@ jobs:
 
           ditto -c -k --sequesterRsrc --keepParent lsl.xcframework lsl.xcframework.zip
 
-          xcrun notarytool submit lsl.xcframework.zip \
-            --apple-id "$APPLE_NOTARIZE_USERNAME" \
-            --password "$APPLE_NOTARIZE_PASSWORD" \
-            --team-id "$APPLE_DEVELOPMENT_TEAM" \
-            --wait
-          xcrun stapler staple lsl.xcframework
-
       - name: upload artifacts
         uses: actions/upload-artifact@v4
         with:
@@ -210,4 +214,4 @@ jobs:
                 NAME=$(basename $pkg)
                 MIME=$(file --mime-type $pkg|cut -d ' ' -f2)
                 curl -X POST -H "Accept: application/vnd.github.v3+json" -H "Authorization: $TOKEN" -H "Content-Type: $MIME" --data-binary @$pkg $UPLOAD_URL?name=$NAME
-              done
+              done

CMakeLists.txt

@@ -19,7 +19,7 @@ include(cmake/TargetLib.cmake)  #
 include(cmake/Installation.cmake)  #
 include(cmake/TargetOther.cmake)
 
-if(LSL_UNITTESTS)
+if(LSL_UNITTESTS AND NOT IOS)
 	add_subdirectory(testing)
 endif()
 

cmake/Installation.cmake

@@ -15,8 +15,14 @@ endif()
 # For Apple frameworks, we need to next the install directories within the framework.
 if(APPLE AND LSL_FRAMEWORK)
     # For the includes, this is insufficient. Later we will create more accessible symlinks.
-    set(LSL_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_FRAMEWORK_DIR}/lsl.framework/Versions/A/include)
-    set(LSL_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_FRAMEWORK_DIR}/lsl.framework/Resources/CMake)
+    if(IOS)
+        set(LSL_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_FRAMEWORK_DIR}/lsl.framework/Headers)
+        set(LSL_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_FRAMEWORK_DIR}/lsl.framework/CMake)
+    else()
+        set(LSL_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_FRAMEWORK_DIR}/lsl.framework/Versions/A/include)
+        set(LSL_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_FRAMEWORK_DIR}/lsl.framework/Resources/CMake)
+    endif()
+
 else()
     set(LSL_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR})
     set(LSL_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/lsl)
@@ -73,7 +79,7 @@ install(
     DESTINATION ${LSL_CONFIG_INSTALL_DIR}
 )
 
-if(APPLE AND LSL_FRAMEWORK)
+if(APPLE AND LSL_FRAMEWORK AND NOT IOS)
     # Create symlinks for the framework. The variables we want to use to identify the symlink locations
     #  are not available at install time. Instead, we create a script during configuration time that will
     #  be run at install time to create the symlinks.

cmake/TargetLib.cmake

@@ -78,7 +78,7 @@ if(APPLE)
     if(LSL_FRAMEWORK)
         set_target_properties(lsl PROPERTIES
                 FRAMEWORK TRUE
-                FRAMEWORK_VERSION A
+                FRAMEWORK_VERSION A  # Ignored on iOS
                 MACOSX_FRAMEWORK_IDENTIFIER "org.labstreaminglayer.liblsl"
                 MACOSX_FRAMEWORK_SHORT_VERSION_STRING "${liblsl_VERSION_MAJOR}.${liblsl_VERSION_MINOR}"
                 MACOSX_FRAMEWORK_BUNDLE_VERSION ${PROJECT_VERSION}

cmake/TargetOther.cmake

@@ -1,13 +1,16 @@
-include(cmake/LSLCMake.cmake)  # Needed for `installLSLApp`
+include(cmake/LSLCMake.cmake)  # Needed for `installLSLApp` and `LSLGenerateCPackConfig`
 
-# Build utilities
+    # Build utilities
 add_executable(lslver testing/lslver.c)
 target_link_libraries(lslver PRIVATE lsl)
+if(NOT IOS)
 installLSLApp(lslver)
-
+endif(NOT IOS)
 if(NOT WIN32 AND LSL_TOOLS)
     add_executable(blackhole testing/blackhole.cpp)
     target_link_libraries(blackhole PRIVATE Threads::Threads)
     target_include_directories(blackhole PRIVATE "thirdparty/asio/")
-    installLSLApp(blackhole)
+    if(NOT IOS)
+        installLSLApp(blackhole)
+    endif(NOT IOS)
 endif()