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

Set CMAKE_SYSTEM_NAME to iOS, tvOS, watchOS from CMake 3.14 #7924

Merged
merged 9 commits into from Oct 23, 2020

Conversation

czoido
Copy link
Contributor

@czoido czoido commented Oct 22, 2020

Changelog: Fix: Set CMAKE_SYSTEM_NAME set to iOS, tvOS or watchOS or Darwin depending on the CMake version.
Docs: Omit

Closes: #7875

Since CMake 3.14 setting CMAKE_SYSTEM_NAME to iOS, tvOS or watchOS is supported. This PR checks the version of CMake in the build helper and sets the definition accordingly.

TODO: Update this implementation in the toolchain files. I'll open an issue about this.

  • 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.

@czoido czoido modified the milestones: 1.31, 1.32 Oct 22, 2020
@czoido czoido marked this pull request as draft Oct 22, 2020
a4z
a4z approved these changes Oct 22, 2020
conans/client/build/cmake_flags.py Outdated Show resolved Hide resolved
@czoido czoido marked this pull request as ready for review Oct 22, 2020
@czoido czoido requested a review from jgsogo Oct 22, 2020
conans/client/build/cmake_flags.py Outdated Show resolved Hide resolved
conans/client/build/cmake_flags.py Outdated Show resolved Hide resolved
@czoido czoido requested a review from jgsogo Oct 22, 2020
jgsogo
jgsogo approved these changes Oct 22, 2020
@jgsogo jgsogo merged commit 5e47304 into conan-io:develop Oct 23, 2020
2 checks passed
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] CMAKE_SYSTEM_NAME is set to Darwin on iOS (watch and tv OS)
4 participants