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

defining CMAKE_SYSTEM_XXX even if toolchain is defined, but protected #17036

Merged

Conversation

memsharded
Copy link
Member

@memsharded memsharded commented Sep 23, 2024

Changelog: Fix: Let CMakeToolchain defining CMAKE_SYSTEM_XXX even if user_toolchain is defined, but protected in case the toolchain really defines them.
Docs: conan-io/docs#3852

Close #16807

Copy link
Contributor

@jcar87 jcar87 left a comment

Choose a reason for hiding this comment

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

LGTM!

I think as long as CMAKE_SYSTEM_NAME is only defined by us when cross-building (and the user didn't give us a value), this should preserve the behaviour.

@czoido czoido merged commit 216d3ac into conan-io:develop2 Sep 24, 2024
2 checks passed
@memsharded memsharded deleted the fix/cmake_system_name_user_toolchain branch September 24, 2024 12:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants