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

Bugfix: correctly set CMAKE_OSX_SYSROOT and CMAKE_OSX_ARCHITECTURES #7512

Merged
merged 2 commits into from Aug 6, 2020

Conversation

SSE4
Copy link
Contributor

@SSE4 SSE4 commented Aug 6, 2020

closes: #7493

Changelog: Bugfix: correctly set CMAKE_OSX_SYSROOT and CMAKE_OSX_ARCHITECTURES.
Docs: omit

what exactly has been fixed?

  • custom setting (e.g. arch=ios_far) will not result in -DCMAKE_OSX_ARCHITECTURES="None"

  • return correct SDK root (e.g. iPhoneOS.platform) for custom settings (e.g. os=iOS and arch=ios_fat)

  • it's redundant to invoke xcrun if environment variable SDKROOT was set - CMake will use it anyway

  • don't try to set CMAKE_OSX_ARCHITECTURES/CMAKE_OSX_SYSROOT if toolchain file is used (see comment as well)

  • Refer to the issue that supports this Pull Request.

  • If the issue has missing info, explain the purpose/use case/pain/need that covers this Pull Request.

  • I've read the Contributing guide.

  • I've followed the PEP8 style guides for Python code.

  • I've opened another PR in the Conan docs repo to the develop branch, documenting this one.

Note: By default this PR will skip the slower tests and will use a limited set of python versions. Check here how to increase the testing level by writing some tags in the current PR body text.

…ases

Signed-off-by: SSE4 <tomskside@gmail.com>
conans/client/build/cmake_flags.py Outdated Show resolved Hide resolved
Copy link
Member

@memsharded memsharded left a comment

Fix is looking good, many thanks @SSE4

conans/client/build/cmake_flags.py Outdated Show resolved Hide resolved
@memsharded memsharded merged commit 74548dd into conan-io:develop Aug 6, 2020
2 checks passed
@memsharded
Copy link
Member

memsharded commented Aug 6, 2020

This was assigned to 1.28.1, but was incorrectly merged to develop instead of release/1.28.

@czoido will port it to release/1.28. Thanks!

czoido pushed a commit to czoido/conan that referenced this pull request Aug 6, 2020
…onan-io#7512)

* - fix CMAKE_OSX_SYSROOT and CMAKE_OSX_ARCHITECTURES for some corner-cases

Signed-off-by: SSE4 <tomskside@gmail.com>

* Update cmake_flags.py
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.

[bug] creating iOS packages using simple toolchains broken as of conan 1.26
3 participants