Bugfix: correctly set CMAKE_OSX_SYSROOT and CMAKE_OSX_ARCHITECTURES #7512
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ases Signed-off-by: SSE4 <[email protected]>
SSE4
commented
Aug 6, 2020
memsharded
approved these changes
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 <[email protected]> * Update cmake_flags.py
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes: #7493
Changelog: Bugfix: correctly set
CMAKE_OSX_SYSROOTandCMAKE_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=iOSandarch=ios_fat)it's redundant to invoke
xcrunif environment variableSDKROOTwas set - CMake will use it anywaydon't try to set
CMAKE_OSX_ARCHITECTURES/CMAKE_OSX_SYSROOTif 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
developbranch, 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.