Architecture fixes, added CI workflows

Author: ivannador

.github/workflows/combined.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
     types: [ opened, synchronize ]
 
-jobs:  
+jobs:
   build_with_latest_OS64COMBINED:
     name: "Latest Xcode, Target iOS Combined [x86_64, arm64] Target SDK 14.0"
     runs-on: macos-latest
@@ -37,6 +37,21 @@ jobs:
         xcode-version: '15.0.1'
     - name: Build
       run: ./.github/build.sh
+  build_with_15_0_1_SIMULATOR_WATCHOSCOMBINED:
+    name: "Xcode version 15.0.1, Target watchOS Simulator Combined [arm64, x86_64] Target SDK 10.0"
+    runs-on: macos-13
+    env:
+      PLATFORM: SIMULATOR_WATCHOSCOMBINED
+      USE_NEW_BUILD: 1
+      DEPLOYMENT_TARGET: 10.0
+      USE_XCODE: 1
+    steps:
+    - uses: actions/checkout@v2
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: '15.0.1'
+    - name: Build
+      run: ./.github/build.sh
   build_with_15_0_1_TVOSCOMBINED:
     name: "Xcode version 15.0.1, Target tvOS Combined [arm64, x86_64] Target SDK 16.0"
     runs-on: macos-13
@@ -66,4 +81,4 @@ jobs:
       with:
         xcode-version: '15.0.1'
     - name: Build
-      run: ./.github/build.sh
+      run: ./.github/build.sh

.github/workflows/watchos.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build_with_15_4_WATCHOS:
-    name: "Xcode version 15.4, Target tvOS [armv7k, arm64_32] Target SDK 10.5"
+    name: "Xcode version 15.4, Target watchOS [armv7k, arm64_32] Target SDK 10.5"
     runs-on: macos-14
     env:
       PLATFORM: WATCHOS
@@ -21,7 +21,7 @@ jobs:
     - name: Build
       run: ./.github/build.sh
   build_with_15_0_1_SIMULATOR_WATCHOS:
-    name: "Xcode version 15.0.1, Target tvOS [x86_64] Target SDK 10.0"
+    name: "Xcode version 15.0.1, Target watchOS Simulator [x86_64] Target SDK 10.0"
     runs-on: macos-13
     env:
       PLATFORM: SIMULATOR_WATCHOS
@@ -32,4 +32,17 @@ jobs:
       with:
         xcode-version: '15.0.1'
     - name: Build
-      run: ./.github/build.sh
+      run: ./.github/build.sh
+  build_with_15_0_1_SIMULATORARM64_WATCHOS:
+    name: "Xcode version 15.0.1, Target watchOS Simulator [arm64] Target SDK 10.0"
+    runs-on: macos-13
+    env:
+      PLATFORM: SIMULATORARM64_WATCHOS
+      DEPLOYMENT_TARGET: 10.0
+    steps:
+    - uses: actions/checkout@v2
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: '15.0.1'
+    - name: Build
+      run: ./.github/build.sh

README.md

@@ -25,10 +25,10 @@ A CMake toolchain file for iOS (+ Catalyst), watchOS, tvOS and macOS development
 * _SIMULATOR_TVOS_ - to build for tvOS Simulator (x86_64)
 * _SIMULATORARM64_TVOS_ = to build for tvOS Simulator (arm64)
 * _WATCHOS_ - to build for watchOS (armv7k, arm64_32)
-* _WATCHOSCOMBINED_ - to build for watchOS & Simulator (armv7k, arm64_32, i386)
-* _SIMULATOR_WATCHOS_ - to build for watchOS Simulator (i386)
+* _WATCHOSCOMBINED_ - to build for watchOS & Simulator (armv7k, arm64_32, x86_64)
+* _SIMULATOR_WATCHOS_ - to build for watchOS Simulator (x86_64)
 * _SIMULATORARM64_WATCHOS_ = to build for watchOS Simulator (arm64)
-* _SIMULATOR_WATCHOSCOMBINED_ = to build for watchOS Simulator (FAT lib) (arm64, i386)
+* _SIMULATOR_WATCHOSCOMBINED_ = to build for watchOS Simulator (FAT lib) (arm64, x86_64)
 * _MAC_ - to build for macOS (x86_64)
 * _MAC_ARM64_ - to build for macOS on Apple Silicon (arm64)
 * _MAC_UNIVERSAL_ - to build for macOS on x86_64 and Apple Silicon (arm64) combined

ios.toolchain.cmake

@@ -74,7 +74,7 @@
 #    WATCHOSCOMBINED = Build for armv7k arm64_32 x86_64 watchOS + watchOS Simulator. Combined into FAT STATIC lib (only supported on 3.14+ of CMake with "-G Xcode" argument in combination with the "cmake --install" CMake build step)
 #    SIMULATOR_WATCHOS = Build for x86_64 for watchOS Simulator.
 #    SIMULATORARM64_WATCHOS = Build for arm64 for watchOS Simulator.
-#    SIMULATOR_WATCHOSCOMBINED = Build for arm64 for watchOS Simulator.
+#    SIMULATOR_WATCHOSCOMBINED = Build for arm64 x86_64 for watchOS Simulator. Combined into FAT STATIC lib (supported on 3.14+ of CMakewith "-G Xcode" argument ONLY)
 #    MAC = Build for x86_64 macOS.
 #    MAC_ARM64 = Build for Apple Silicon macOS.
 #    MAC_UNIVERSAL = Combined build for x86_64 and Apple Silicon on macOS.
@@ -462,12 +462,12 @@ elseif(PLATFORM_INT STREQUAL "WATCHOSCOMBINED")
   if(MODERN_CMAKE)
     if(NOT ARCHS)
       if (XCODE_VERSION_INT VERSION_GREATER 10.0)
-        set(ARCHS armv7k arm64_32 i386)
-        set(APPLE_TARGET_TRIPLE_INT arm64_32-i386-apple-watchos${DEPLOYMENT_TARGET})
+        set(ARCHS armv7k arm64_32 x86_64)
+        set(APPLE_TARGET_TRIPLE_INT arm64_32-x86_64-apple-watchos${DEPLOYMENT_TARGET})
         set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchos*] "armv7k arm64_32")
-        set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchsimulator*] "i386")
+        set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchsimulator*] "x86_64")
         set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchos*] "armv7k arm64_32")
-        set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchsimulator*] "i386")
+        set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchsimulator*] "x86_64")
       else()
         set(ARCHS armv7k i386)
         set(APPLE_TARGET_TRIPLE_INT arm-i386-apple-watchos${DEPLOYMENT_TARGET})
@@ -485,8 +485,13 @@ elseif(PLATFORM_INT STREQUAL "WATCHOSCOMBINED")
 elseif(PLATFORM_INT STREQUAL "SIMULATOR_WATCHOS")
   set(SDK_NAME watchsimulator)
   if(NOT ARCHS)
-    set(ARCHS i386)
-    set(APPLE_TARGET_TRIPLE_INT i386-apple-watchos${DEPLOYMENT_TARGET}-simulator)
+    if (XCODE_VERSION_INT VERSION_GREATER 10.0)
+      set(ARCHS x86_64)
+      set(APPLE_TARGET_TRIPLE_INT x86_64-apple-watchos${DEPLOYMENT_TARGET}-simulator)
+    else()
+      set(ARCHS i386)
+      set(APPLE_TARGET_TRIPLE_INT i386-apple-watchos${DEPLOYMENT_TARGET}-simulator)
+    endif()
   else()
     set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-watchos${DEPLOYMENT_TARGET}-simulator)
   endif()
@@ -503,19 +508,20 @@ elseif(PLATFORM_INT STREQUAL "SIMULATOR_WATCHOSCOMBINED")
   if(MODERN_CMAKE)
     if(NOT ARCHS)
       if (XCODE_VERSION_INT VERSION_GREATER 12.0)
-        set(ARCHS arm64 i386)
+        set(ARCHS arm64 x86_64)
         set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchos*] "")
-        set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchsimulator*] "i386 arm64")
+        set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchsimulator*] "arm64 x86_64")
         set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchos*] "")
-        set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchsimulator*] "i386 arm64")
+        set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchsimulator*] "arm64 x86_64")
+        set(APPLE_TARGET_TRIPLE_INT arm64_x86_64-apple-watchos${DEPLOYMENT_TARGET}-simulator)
       else()
         set(ARCHS arm64 i386)
         set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchos*] "")
         set(CMAKE_XCODE_ATTRIBUTE_ARCHS[sdk=watchsimulator*] "i386")
         set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchos*] "")
         set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS[sdk=watchsimulator*] "i386")
+        set(APPLE_TARGET_TRIPLE_INT arm64_i386-apple-watchos${DEPLOYMENT_TARGET}-simulator)
       endif()
-      set(APPLE_TARGET_TRIPLE_INT arm64_i386-apple-watchos${DEPLOYMENT_TARGET}-simulator)
     else()
       set(APPLE_TARGET_TRIPLE_INT ${ARCHS_SPLIT}-apple-watchos${DEPLOYMENT_TARGET}-simulator)
     endif()