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

CMake: support using system-wide zstd library #8817

Merged
merged 2 commits into from Jun 16, 2020
Merged

Conversation

Tilka
Copy link
Member

@Tilka Tilka commented May 17, 2020

CMake does not have native support for zstd yet, so find_package() doesn't work out of the box.

@JosJuice: Note that #8538 will need to link against zstd instead of zstd::zstd since CMake's FindPkgConfig module doesn't add an alias like Externals/zstd/CMakeLists.txt does.

@@ -1,4 +1,4 @@
project(bzip2 C)
project(zstd C)
Copy link
Member

Choose a reason for hiding this comment

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

Oops...

@@ -608,7 +608,7 @@ else()
add_subdirectory(Externals/liblzma)
endif()

find_package(zstd)
pkg_search_module(ZSTD QUIET libzstd)
Copy link
Member

Choose a reason for hiding this comment

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

I'd prefer if we provide a Findzstd.cmake helper instead.

Copy link
Member Author

Choose a reason for hiding this comment

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

Why?

@degasus degasus merged commit 7cdd0e2 into dolphin-emu:master Jun 16, 2020
@Tilka Tilka deleted the cmake branch June 16, 2020 22:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
3 participants