Allow configuring iOS build with CMake #3234

louwers · 2025-02-17T15:32:30Z

Allows configuring Xcode with CMake for iOS builds.
Add new job to ios-ci that builds the mbgl-core, ios-sdk-static and app CMake targets for iOS.
Move some files that are implementations for the core to platform/darwin/core to better separate out the iOS SDK.
Fix some build issues (unused/uninitialized variables).
Add license for SMCalloutView.
Fix typo MLN_PUBLIC_IOS_APP_SOPURCE.
Update MapLibre Developer Documentation to reflect changes in this PR.
Remove some unused files.
Add CMakePresets.json. Other platforms will be added in a follow-up PR. Info here: https://martin-fieber.de/blog/cmake-presets/

.github/workflows/ios-ci.yml

docs/mdbook/src/ios/README.md

github-actions · 2025-02-17T17:52:34Z

Bloaty Results 🐋

Compared to main

    FILE SIZE        VM SIZE    
 --------------  -------------- 
  [ = ]       0  -0.0%     -24    TOTAL

Full report: https://maplibre-native.s3.eu-central-1.amazonaws.com/bloaty-results/pr-3234-compared-to-main.txt

Compared to d387090 (legacy)

    FILE SIZE        VM SIZE    
 --------------  -------------- 
   +31% +36.2Mi  +438% +26.2Mi    TOTAL

Full report: https://maplibre-native.s3.eu-central-1.amazonaws.com/bloaty-results/pr-3234-compared-to-legacy.txt

github-actions · 2025-02-17T17:55:48Z

Benchmark Results ⚡

Benchmark                                                     Time             CPU      Time Old      Time New       CPU Old       CPU New
------------------------------------------------------------------------------------------------------------------------------------------
OVERALL_GEOMEAN                                            +0.0059         +0.0059             0             0             0             0

Full report: https://maplibre-native.s3.eu-central-1.amazonaws.com/benchmark-results/pr-3234-compared-to-main.txt

github-actions · 2025-02-18T00:38:26Z

Bloaty Results (iOS) 🐋

Compared to main

    FILE SIZE        VM SIZE    
 --------------  -------------- 
  +0.0%      +8  [ = ]       0    TOTAL

Full report: https://maplibre-native.s3.eu-central-1.amazonaws.com/bloaty-results-ios/pr-3234-compared-to-main.txt

louwers · 2025-02-23T00:54:58Z

src/mbgl/mtl/drawable.cpp

@@ -252,6 +252,7 @@ void Drawable::draw(PaintParameters& parameters) const {
            const auto stencilMode = enableStencil ? parameters.stencilModeForClipping(tileID->toUnwrapped())
                                                   : gfx::StencilMode::disabled();
            impl->depthStencilState = context.makeDepthStencilState(depthMode, stencilMode, renderable);
+            assert(newStencilMode);


Issue: #3248

louwers · 2025-02-23T00:57:07Z

platform/darwin/core/http_file_source.mm

@@ -86,7 +86,6 @@ void cancel() {
 public:
    Impl(const ResourceOptions& resourceOptions_, const ClientOptions& clientOptions_)
        : resourceOptions(resourceOptions_.clone()), clientOptions(clientOptions_.clone()) {
-        @autoreleasepool {


This was causing a crash. I don't think this @autoreleasepool is needed because we use ARC?

louwers · 2025-02-23T01:00:06Z

platform/darwin/darwin.cmake

+
+add_custom_command(
+    OUTPUT ${MLN_GENERATED_DARWIN_STYLE_SOURCE} ${MLN_GENERATED_DARWIN_STYLE_HEADERS}
+    COMMAND ${BAZEL} build //platform/darwin:generated_code


I use Bazel to generate the code so I don't have to redo all that build logic in CMake... Also nice way to make sure that the output is the same as for the Bazel build.

platform/darwin/darwin.cmake

louwers · 2025-02-23T01:12:47Z

platform/darwin/darwin.cmake

@@ -0,0 +1,164 @@
+enable_language(OBJC OBJCXX Swift)


Common code ios.cmake and macos.cmake.

CMakePresets.json

TimSylvester · 2025-02-25T15:37:53Z

I had to upgrade to the latest CMake, maybe the cmake_minimum_required should be increased?

The Team ID QMC7N4BDVZ is embedded in platform/ios/app/CMakeLists.txt. I guess that needs to come from a config file like config.bzl or environment variable.

louwers · 2025-02-25T15:46:05Z

@TimSylvester Yes if you use the CMakePresets.json you need CMake 3.31.

@TimSylvester That's the one on CI. Yes I'll fix that.

Allow configuring iOS build with CMake again

bdbe10f

louwers requested a review from alexcristici February 17, 2025 15:32

cgalvan approved these changes Feb 17, 2025

View reviewed changes

.github/workflows/ios-ci.yml Outdated Show resolved Hide resolved

docs/mdbook/src/ios/README.md Outdated Show resolved Hide resolved

get ios-sdk-static to compile

ecb4d10

louwers force-pushed the ios-cmake branch from 29ba4b8 to ecb4d10 Compare February 17, 2025 23:42

Update README.md

de54b7e

louwers added 3 commits February 22, 2025 12:01

Move core files

1dfc344

Merge remote-tracking branch 'origin' into ios-cmake

d71f546

Add missing source file CMake

caa4f33

louwers mentioned this pull request Feb 22, 2025

newStencilMode null dereference #3248

Open

louwers added 2 commits February 23, 2025 01:49

Build iOS App

faf7081

Build app in os-ci

f33aa9c

louwers changed the title ~~Allow configuring iOS build with CMake again~~ Allow configuring iOS build with CMake Feb 23, 2025

louwers commented Feb 23, 2025

View reviewed changes

platform/darwin/darwin.cmake Show resolved Hide resolved

louwers commented Feb 23, 2025

View reviewed changes

CMakePresets.json Outdated Show resolved Hide resolved

Run on self-hosted runner for iOS provisioning

f7aa2bc

louwers requested a review from cgalvan February 23, 2025 01:18

cgalvan approved these changes Feb 24, 2025

View reviewed changes

CMakePresets.json Outdated Show resolved Hide resolved

louwers added 5 commits February 25, 2025 13:19

Add macos-node preset

10a2d5b

Add EXCLUDE_FROM_ALL to custom-layer-examples

6237f04

Disable RTTI for Objective-C++ source files

1ff7aad

Disable RTTI iOS

6077a09

Avoid crash uitests

8d81185

louwers added 7 commits February 26, 2025 01:04

Allow setting DEVELOPMENT_TEAM_ID

3fc9f8a

Set team ID from environment

932ba29

Update CMake version Node.js

754ec34

Bump cmakeMinimumRequired CMakePresets.json

1232909

Allow builds without signing CMake

ba2c3ae

Allow builds without signing

f8868dd

Remove team id from ios-ci.yml

2d8d882

louwers enabled auto-merge (squash) February 26, 2025 11:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow configuring iOS build with CMake #3234

Allow configuring iOS build with CMake #3234

louwers commented Feb 17, 2025 •

edited

Loading

github-actions bot commented Feb 17, 2025 •

edited

Loading

github-actions bot commented Feb 17, 2025 •

edited

Loading

github-actions bot commented Feb 18, 2025 •

edited

Loading

louwers Feb 23, 2025

louwers Feb 23, 2025

louwers Feb 23, 2025 •

edited

Loading

louwers Feb 23, 2025

TimSylvester commented Feb 25, 2025

louwers commented Feb 25, 2025

Allow configuring iOS build with CMake #3234

Are you sure you want to change the base?

Allow configuring iOS build with CMake #3234

Conversation

louwers commented Feb 17, 2025 • edited Loading

github-actions bot commented Feb 17, 2025 • edited Loading

Bloaty Results 🐋

Full report: https://maplibre-native.s3.eu-central-1.amazonaws.com/bloaty-results/pr-3234-compared-to-main.txt

github-actions bot commented Feb 17, 2025 • edited Loading

github-actions bot commented Feb 18, 2025 • edited Loading

Bloaty Results (iOS) 🐋

Full report: https://maplibre-native.s3.eu-central-1.amazonaws.com/bloaty-results-ios/pr-3234-compared-to-main.txt

louwers Feb 23, 2025

Choose a reason for hiding this comment

louwers Feb 23, 2025

Choose a reason for hiding this comment

louwers Feb 23, 2025 • edited Loading

Choose a reason for hiding this comment

louwers Feb 23, 2025

Choose a reason for hiding this comment

TimSylvester commented Feb 25, 2025

louwers commented Feb 25, 2025

louwers commented Feb 17, 2025 •

edited

Loading

github-actions bot commented Feb 17, 2025 •

edited

Loading

github-actions bot commented Feb 17, 2025 •

edited

Loading

github-actions bot commented Feb 18, 2025 •

edited

Loading

louwers Feb 23, 2025 •

edited

Loading