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

CMakeLists: Link zlib in privately where applicable, and don't dump its includes into the top-level directory #6639

Merged
merged 2 commits into from Apr 13, 2018

Conversation

lioncash
Copy link
Member

Cleans up our inclusions a little more and also makes one of DiscIO's dependencies explicit instead of relying on Core to provide it. This also unifies the target names under the name of the target that find_package would introduce, allowing the use of it directly instead of hardcoding in z.

Also, use the target name introduced via find_package(ZLIB) instead
of hardcoding the 'z' name in the link libraries.
@leoetlino leoetlino merged commit b84806e into dolphin-emu:master Apr 13, 2018
@lioncash lioncash deleted the zlib branch April 13, 2018 17:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
2 participants