Skip to content

Commit adfa4eb

Browse files
committed
CMake: Add ios toolchain from leetal/ios-cmake
update ci runner with ios toolchain flag prevent gersemi from formatting toolchain added a cmake-minimum of 3.10 to silence errors from ios toolchain
1 parent 47973e3 commit adfa4eb

File tree

3 files changed

+1166
-8
lines changed

3 files changed

+1166
-8
lines changed

.github/workflows/ci-cmake.yml

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@ jobs:
6262
os: windows-2019
6363
platform: windows
6464
compiler: mingw
65-
config-flags: -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=cc -DCMAKE_CXX_COMPILER=c++
65+
config-flags:
66+
-GNinja -DCMAKE_BUILD_TYPE=Release
67+
-DCMAKE_CXX_COMPILER=cc -DCMAKE_CXX_COMPILER=c++
6668
artifact-name: godot-cpp-linux-mingw-x86_64-release.cmake
6769
artifact-path: cmake-build/bin/libgodot-cpp.windows.template_release.x86_64.a
6870
run-tests: false
@@ -90,7 +92,11 @@ jobs:
9092
- name: 🍏 iOS (arm64, XCode)
9193
os: macos-latest
9294
platform: ios
93-
config-flags: -G Xcode -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO -DCMAKE_BUILD_TYPE=Release
95+
config-flags:
96+
-G Xcode
97+
--toolchain cmake/ios.toolchain.cmake
98+
-DPLATFORM=OS64
99+
build-flags: --config Release
94100
artifact-name: godot-cpp-ios-arm64-release.cmake
95101
artifact-path: cmake-build/bin/libgodot-cpp.ios.template_release.arm64.a
96102
flags: arch=arm64
@@ -122,17 +128,22 @@ jobs:
122128
windows-compiler: ${{ matrix.compiler }}
123129
buildtool: cmake
124130

125-
- name: Configure
131+
- name: Configure gdexample.template_debug
126132
run: >
127133
cmake --log-level=VERBOSE -S . -B cmake-build ${{ env.config-flags }} ${{ matrix.config-flags }}
128134
129-
- name: Build test.template_debug
135+
- name: Build gdexample.template_debug
136+
run: >
137+
cmake --build cmake-build --verbose --target gdexample ${{ matrix.build-flags }}
138+
139+
- name: Configure gdexample.template_release
130140
run: >
131-
cmake --build cmake-build --verbose --target godot-cpp.test.template_debug ${{ matrix.build-flags }}
141+
cmake --fresh --log-level=VERBOSE -S . -B cmake-build
142+
-DGODOTCPP_TARGET=template_release ${{ env.config-flags }} ${{ matrix.config-flags }}
132143
133-
- name: Build test.template_release
144+
- name: Build gdexample.template_release
134145
run: >
135-
cmake --build cmake-build --verbose --target godot-cpp.test.template_release ${{ matrix.build-flags }}
146+
cmake --build cmake-build --verbose --target gdexample ${{ matrix.build-flags }}
136147
137148
- name: Run sccache stat for check
138149
shell: bash

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.17)
1+
cmake_minimum_required(VERSION 3.10...3.17)
22

33
#[=======================================================================[.rst:
44

0 commit comments

Comments
 (0)