ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9622 from skylersaleh/fix_zstd_headers 

Check that zstd headers can be found before using a shared zstd library
This commit is contained in:
Léo Lam 2021-04-06 12:42:44 +02:00 committed by GitHub
parent e89ae71cec b0d91a5399
commit d96874a4db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -615,11 +615,16 @@ else()
endif() endif()
pkg_check_modules(ZSTD QUIET libzstd>=1.4.0) pkg_check_modules(ZSTD QUIET libzstd>=1.4.0)
if(ZSTD_FOUND) check_include_file(zstd.h HAVE_ZSTD_H)
if(ZSTD_FOUND AND HAVE_ZSTD_H)
message(STATUS "Using shared zstd version: " ${ZSTD_VERSION}) message(STATUS "Using shared zstd version: " ${ZSTD_VERSION})
else() else()
check_vendoring_approved(zstd) check_vendoring_approved(zstd)
if(ZSTD_FOUND AND NOT HAVE_ZSTD_H)
message(STATUS "Shared zstd found but lacks headers, falling back to the static library")
else()
message(STATUS "Shared zstd not found, falling back to the static library") message(STATUS "Shared zstd not found, falling back to the static library")
endif()
add_subdirectory(Externals/zstd) add_subdirectory(Externals/zstd)
endif() endif()