Skip to content

Clean up cmake ios for new cmake version#1843

Open
AustinBenoit wants to merge 2 commits intomainfrom
cmake-ios
Open

Clean up cmake ios for new cmake version#1843
AustinBenoit wants to merge 2 commits intomainfrom
cmake-ios

Conversation

@AustinBenoit
Copy link
Contributor

Description

Provide details of the change, and generalize the change in the PR title above.

Cleaning up cmake with the new version that natively supports finding the iOS root directories


Testing

Describe how you've tested these changes. Link any manually triggered Integration tests or CPP binary SDK Packaging Github Action workflows, if applicable.

Built ios locally and ran integration tests.


Type of Change

Place an x the applicable box:

  • Bug fix. Add the issue # below if applicable.
  • New feature. A non-breaking change which adds functionality.
  • Other, such as a build process or documentation change.

Notes

  • Bug fixes and feature changes require an update to the Release Notes section of release_build_files/readme.md.
  • Read the contribution guidelines CONTRIBUTING.md.
  • Changes to the public API require an internal API review. If you'd like to help us make Firebase APIs better, please propose your change in a feature request so that we can discuss it together.

@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request streamlines the build process for Firebase C++ SDK on Apple platforms (iOS and tvOS) by adopting CMake's native support for these operating systems. By removing custom toolchain files and updating build configurations and documentation, the change simplifies future maintenance and aligns the project with modern CMake practices, making the build setup more robust and easier to understand.

Highlights

  • Modernized CMake for Apple Platforms: Switched from custom CMake toolchain files (e.g., ios.cmake, apple.toolchain.cmake) to leveraging CMake's native support for iOS and tvOS, available since CMake 3.14+.
  • Simplified Build Configuration: Updated CMakeLists.txt and build scripts (build.sh, build_ios_tvos.py) to use CMAKE_SYSTEM_NAME=iOS or CMAKE_SYSTEM_NAME=tvOS and CMAKE_OSX_SYSROOT for platform detection and configuration.
  • Documentation Updates: Modified AGENTS.md and README.md to reflect the new, simplified CMake configuration commands for iOS and tvOS.
  • Removed Legacy Toolchain Files: Deleted the custom cmake/toolchains/apple.toolchain.cmake, cmake/toolchains/ios.cmake, and cmake/toolchains/ios_simulator.cmake files, reducing codebase complexity.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Changelog
  • AGENTS.md
    • Updated instructions for configuring CMake for iOS builds.
  • CMakeLists.txt
    • Modified platform detection logic to use CMAKE_SYSTEM_NAME for iOS and tvOS.
  • README.md
    • Updated build instructions for iOS and tvOS to reflect native CMake support.
  • build_scripts/ios/build.sh
    • Modified the build script to use CMAKE_SYSTEM_NAME=iOS and CMAKE_OSX_SYSROOT instead of a custom toolchain file.
  • build_scripts/tvos/build.sh
    • Modified the build script to use CMAKE_SYSTEM_NAME=tvOS and CMAKE_OSX_SYSROOT instead of a custom toolchain file and PLATFORM.
  • cmake/toolchains/apple.toolchain.cmake
    • Removed the custom Apple toolchain file.
  • cmake/toolchains/ios.cmake
    • Removed the custom iOS toolchain file.
  • cmake/toolchains/ios_simulator.cmake
    • Removed the custom iOS simulator toolchain file.
  • scripts/gha/build_ios_tvos.py
    • Updated the Python script to remove references to custom toolchain files and pass native CMake system and sysroot parameters.
  • test_mac_ios.sh
    • Updated the iOS test script to use CMAKE_SYSTEM_NAME=iOS.
  • test_mac_ios_simulator.sh
    • Updated the iOS simulator test script to use CMAKE_SYSTEM_NAME=iOS.
Activity
  • AustinBenoit created the pull request to clean up CMake for new CMake versions.
  • The author confirmed building iOS locally and running integration tests.
  • The change was categorized as a build process or documentation change.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@AustinBenoit AustinBenoit added the tests-requested: quick Trigger a quick set of integration tests. label Mar 16, 2026
@github-actions github-actions bot added tests: in-progress This PR's integration tests are in progress. and removed tests-requested: quick Trigger a quick set of integration tests. labels Mar 16, 2026
@github-actions
Copy link

github-actions bot commented Mar 16, 2026

Integration test with FLAKINESS (succeeded after retry)

Requested by @AustinBenoit on commit 9fb12a2
Last updated: Mon Mar 16 12:19 PDT 2026
View integration test log & download artifacts

Failures Configs
app_check [TEST] [FLAKINESS] [iOS] [macos] [1/2 ios_device: ios_target]
(1 failed tests)  FirebaseAppCheckTest.TestSignIn
firestore [TEST] [FLAKINESS] [Android] [1/3 os: macos] [1/4 android_device: emulator_ftl_latest]
(1 failed tests)  CRASH/TIMEOUT

Add flaky tests to go/fpl-cpp-flake-tracker

@AustinBenoit AustinBenoit added the skip-release-notes Skip release notes check label Mar 16, 2026
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

The pull request refactors the iOS and tvOS build system to leverage native CMake support (version 3.14+), deprecating custom toolchain files. This involves updating documentation, CMakeLists.txt, shell build scripts, and Python build scripts to use CMAKE_SYSTEM_NAME=iOS or CMAKE_SYSTEM_NAME=tvOS and explicitly setting CMAKE_OSX_SYSROOT for simulator builds. A review comment points out that the test_mac_ios_simulator.sh script, after these changes, no longer explicitly sets CMAKE_OSX_SYSROOT=iphonesimulator, which could lead to ambiguity in SDK selection for iOS simulator builds and should be addressed to maintain build consistency.

@github-actions github-actions bot added the tests: succeeded This PR's integration tests succeeded. label Mar 16, 2026
@firebase-workflow-trigger firebase-workflow-trigger bot removed the tests: in-progress This PR's integration tests are in progress. label Mar 16, 2026
@AustinBenoit AustinBenoit added tests-requested: full Trigger a FULL set of integration tests (uses expanded test matrix). and removed tests: succeeded This PR's integration tests succeeded. labels Mar 16, 2026
@github-actions github-actions bot added tests: in-progress This PR's integration tests are in progress. and removed tests-requested: full Trigger a FULL set of integration tests (uses expanded test matrix). labels Mar 16, 2026
@AustinBenoit AustinBenoit requested a review from a-maurice March 16, 2026 16:04
@github-actions github-actions bot added the tests: succeeded This PR's integration tests succeeded. label Mar 16, 2026
@firebase-workflow-trigger firebase-workflow-trigger bot removed the tests: in-progress This PR's integration tests are in progress. label Mar 16, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

skip-release-notes Skip release notes check tests: succeeded This PR's integration tests succeeded.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant