Merge pull request #8817 from Tilka/cmake

CMake: support using system-wide zstd library
dolphin-emu · Jun 16, 2020 · 7cdd0e2 · 7cdd0e2
2 parents fba5ff5 + 506ae2f
commit 7cdd0e2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -608,7 +608,7 @@ else()
   add_subdirectory(Externals/liblzma)
 endif()
 
-find_package(zstd)
+pkg_search_module(ZSTD QUIET libzstd)
 if(ZSTD_FOUND)
   message(STATUS "Using shared zstd")
 else()

diff --git a/Externals/zstd/CMakeLists.txt b/Externals/zstd/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(bzip2 C)
+project(zstd C)
 
 include(CheckTypeSize)
 include(CheckFunctionExists)