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

36 support disabling toolchain cmake option #38

Merged

Conversation

jcfr
Copy link

@jcfr jcfr commented Sep 21, 2016

No description provided.

By default the toolchain file is always passed as an option to cmake/ccmake

It can be explicitly disabled setting the environment variable
DOCKCROSS_PASS_CMAKE_TOOLCHAIN_FILE to 0
…e option

Also revert the changes to ccmake.sh, the restriction doesn't apply to it.

Suggested-by: Matt McCormick <matt.mccormick@kitware.com>
@jcfr jcfr force-pushed the 36-support-disabling-toolchain-cmake-option branch from c82df62 to 4876f14 Compare September 22, 2016 01:11
@jcfr
Copy link
Author

jcfr commented Sep 22, 2016

Et voila, a more elegant way has been implemented.

@thewtex PTAL

Copy link
Collaborator

@thewtex thewtex left a comment

Choose a reason for hiding this comment

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

Excellent! Thanks! LGTM. Will merge after CI completes.

@jcfr
Copy link
Author

jcfr commented Sep 22, 2016

Perfect. Thanks

@thewtex thewtex merged commit 131e640 into dockcross:master Sep 22, 2016
@jcfr jcfr deleted the 36-support-disabling-toolchain-cmake-option branch November 26, 2016 17:37
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.

None yet

2 participants