cmake configuration to nesure mbgl-core contains arm64 libraries

.github/workflows/macos-release.yml

@@ -16,6 +16,7 @@ jobs:
       SYMBOLS: NO
       HOMEBREW_NO_AUTO_UPDATE: 1
       HOMEBREW_NO_INSTALL_CLEANUP: 1
+      CILAUNCH: true
     defaults:
       run:
         working-directory: platform/ios
@@ -73,13 +74,11 @@ jobs:
       - name: Install packaging dependencies
         run: |
           ./platform/ios/scripts/install-packaging-dependencies.sh
-        env:
-          CILAUNCH: true
 
       - name: Build package
         run: make xpackage
-      
+                
       - name: Deploy package
         run: make xdeploy
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
 project("Mapbox GL Native" LANGUAGES CXX C)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)

platform/ios/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.19)
 
 message(source-dir=${CMAKE_SOURCE_DIR} current-dir=${CMAKE_CURRENT_SOURCE_DIR} current-binary-dir=${CMAKE_CURRENT_BINARY_DIR})
 

platform/ios/ios.cmake

@@ -4,6 +4,12 @@ if(NOT DEFINED IOS_DEPLOYMENT_TARGET)
     set(IOS_DEPLOYMENT_TARGET "9.0")
 endif()
 
+# Override default CMake NATIVE_ARCH_ACTUAL
+# https://gitlab.kitware.com/cmake/cmake/-/issues/20893
+# https://stackoverflow.com/a/22689917/5531400
+set(CMAKE_OSX_ARCHITECTURES "$(ARCHS_STANDARD)")
+set_target_properties(mbgl-core PROPERTIES XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH[variant=Debug] "YES")
+
 macro(initialize_ios_target target)
     set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET "${IOS_DEPLOYMENT_TARGET}")
     set_target_properties(${target} PROPERTIES XCODE_ATTRIBUTE_ENABLE_BITCODE "YES")

platform/ios/platform/macos/macos.xcodeproj/project.pbxproj

@@ -2191,7 +2191,6 @@
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 15256;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
-				"EXCLUDED_ARCHS[sdk=*]" = arm64;
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = sdk/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";

platform/ios/platform/macos/scripts/deploy-packages.sh

@@ -140,14 +140,11 @@ if [[ "${GITHUB_RELEASE}" == true ]]; then
         --draft ${PUBLISH_PRE_FLAG}
 fi
 
-step "publish -r xpackage -s symbols"
 publish -r xpackage -s symbols
 
 if [[ ${ENABLE_APP_PUBLISH} = "YES" ]]; then
-    step "publish -r "xpackage SYMBOLS=NO" -a true"
     publish -r "xpackage SYMBOLS=NO" -a true
 else
-    step "publish -r "xpackage SYMBOLS=NO"
     publish -r "xpackage SYMBOLS=NO"
 fi;
 

platform/macos/macos.cmake

@@ -1,5 +1,11 @@
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11")
 
+# Override default CMake NATIVE_ARCH_ACTUAL
+# https://gitlab.kitware.com/cmake/cmake/-/issues/20893
+# https://stackoverflow.com/a/22689917/5531400
+set(CMAKE_OSX_ARCHITECTURES "$(ARCHS_STANDARD)")
+set_target_properties(mbgl-core PROPERTIES XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH[variant=Debug] "YES")
+
 set_target_properties(mbgl-core PROPERTIES XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES)
 
 if(MBGL_WITH_OPENGL)