From 117a4c589911ae68e850bb09b71289f1de9524a2 Mon Sep 17 00:00:00 2001 From: Petr Pokorny Date: Mon, 1 Feb 2021 00:32:09 +0100 Subject: [PATCH] cmake configuration to nesure mbgl-core contains arm64 libraries --- .github/workflows/macos-release.yml | 7 +++---- CMakeLists.txt | 2 +- platform/ios/CMakeLists.txt | 2 +- platform/ios/ios.cmake | 6 ++++++ .../ios/platform/macos/macos.xcodeproj/project.pbxproj | 1 - platform/ios/platform/macos/scripts/deploy-packages.sh | 3 --- platform/macos/macos.cmake | 6 ++++++ 7 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.github/workflows/macos-release.yml b/.github/workflows/macos-release.yml index 86b8edb62..32e66a715 100644 --- a/.github/workflows/macos-release.yml +++ b/.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 }} \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index c8eea2361..f1fd7c089 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/platform/ios/CMakeLists.txt b/platform/ios/CMakeLists.txt index a5ad73c54..75ab9f173 100644 --- a/platform/ios/CMakeLists.txt +++ b/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}) diff --git a/platform/ios/ios.cmake b/platform/ios/ios.cmake index d00b80267..f16b2ed90 100644 --- a/platform/ios/ios.cmake +++ b/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") diff --git a/platform/ios/platform/macos/macos.xcodeproj/project.pbxproj b/platform/ios/platform/macos/macos.xcodeproj/project.pbxproj index 05e15e11e..f1e82ba0c 100644 --- a/platform/ios/platform/macos/macos.xcodeproj/project.pbxproj +++ b/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"; diff --git a/platform/ios/platform/macos/scripts/deploy-packages.sh b/platform/ios/platform/macos/scripts/deploy-packages.sh index 2355bd288..180543fdc 100755 --- a/platform/ios/platform/macos/scripts/deploy-packages.sh +++ b/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; diff --git a/platform/macos/macos.cmake b/platform/macos/macos.cmake index bb140d02c..03192d803 100644 --- a/platform/macos/macos.cmake +++ b/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)