Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ceres] Fix missing iOS deployment target #29432

Merged
merged 1 commit into from
Feb 4, 2023

Conversation

DDoS
Copy link
Contributor

@DDoS DDoS commented Feb 3, 2023

  • Changes comply with the maintainer guide
  • SHA512s are updated for each updated download
  • The "supports" clause reflects platforms that may be fixed by this new version
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

Ceres expects the iOS target version to passed in IOS_DEPLOYMENT_TARGET, and even forcibly unsets CMAKE_OSX_DEPLOYMENT_TARGET.

set(TARGET_OPTIONS )
if(VCPKG_TARGET_IS_IOS)
# Note: CMake uses "OSX" not just for macOS, but also iOS, watchOS and tvOS.
list(APPEND TARGET_OPTIONS "-DIOS_DEPLOYMENT_TARGET=${VCPKG_OSX_DEPLOYMENT_TARGET}")
Copy link
Member

Choose a reason for hiding this comment

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

Should this be something we do in the ios triplets rather than doing it in an individual port like this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The IOS_DEPLOYMENT_TARGET variable that Ceres is using isn't a CMake standard variable. It's something from their custom iOS build chain, and it won't build without it being set. Normally it should be using CMAKE_OSX_DEPLOYMENT_TARGET, but we can just copy it to the other variable to make Ceres happy.

@BillyONeal BillyONeal merged commit f648140 into microsoft:master Feb 4, 2023
@BillyONeal
Copy link
Member

Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants