From 7afbfc83d7e6079f02804f5087853cd13f5e4fbf Mon Sep 17 00:00:00 2001 From: Alexander Batalov Date: Thu, 20 Apr 2023 23:33:02 +0300 Subject: [PATCH] Use Xcode for iOS builds --- .github/workflows/ci-build.yml | 15 ++++++++------- CMakeLists.txt | 1 + 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 25382f2..58985e4 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -78,7 +78,7 @@ jobs: ios: name: iOS - runs-on: macos-11 + runs-on: macos-12 steps: - name: Clone @@ -88,30 +88,31 @@ jobs: uses: actions/cache@v3 with: path: build - key: ios-cmake-v1 + key: ios-cmake-v2 - name: Configure run: | cmake \ -B build \ - -D CMAKE_BUILD_TYPE=RelWithDebInfo \ -D CMAKE_TOOLCHAIN_FILE=cmake/toolchain/ios.toolchain.cmake \ -D ENABLE_BITCODE=0 \ -D PLATFORM=OS64 \ + -G Xcode \ + -D XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED=NO \ # EOL - name: Build run: | cmake \ --build build \ + --config RelWithDebInfo \ -j $(sysctl -n hw.physicalcpu) \ - --target package \ # EOL - # TODO: Should be a part of packaging. - - name: Prepare for uploading + - name: Pack run: | - cp build/fallout2-ce.zip build/fallout2-ce.ipa + cd build + cpack -C RelWithDebInfo - name: Upload uses: actions/upload-artifact@v3 diff --git a/CMakeLists.txt b/CMakeLists.txt index 3cf9e53..2ed6338 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -348,6 +348,7 @@ if(APPLE) set(CPACK_GENERATOR "ZIP") set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY OFF) set(CPACK_PACKAGE_FILE_NAME "fallout2-ce") + set(CPACK_ARCHIVE_FILE_EXTENSION "ipa") else() install(TARGETS ${EXECUTABLE_NAME} DESTINATION .) install(CODE "