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

Prevent cmake from finding includes in miniconda. #2

Merged
merged 1 commit into from Oct 3, 2017

Conversation

ktlim
Copy link
Contributor

@ktlim ktlim commented Oct 3, 2017

On Ubuntu, iconv should be used from the system/compiler library but cmake finds an (inconsistent) include file in miniconda. This change ensures that cmake will ignore all miniconda includes.

@ktlim ktlim requested a review from parejkoj October 3, 2017 03:40
@timj
Copy link
Member

timj commented Oct 3, 2017

Can we include the comment that we use in the MariaDB version of this?

# Prevent CMake from finding and linking against libraries distributed in $(dirname
# python)/../lib. This is CMake's default behaviour, but can cause us to erroneously link
# against libraries distributed by e.g. Anaconda.

Copy link

@parejkoj parejkoj left a comment

Choose a reason for hiding this comment

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

Add @timj 's comment, otherwise this is good.

On Ubuntu, iconv should be used from the system/compiler library but cmake finds an (inconsistent) include file in miniconda.  This change ensures that cmake will ignore all miniconda includes.
@ktlim ktlim merged commit 7e20540 into master Oct 3, 2017
@ktlim ktlim deleted the tickets/DM-12086 branch August 25, 2018 05:11
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

3 participants