Merge pull request #8667 from Mystro256/master

Allow for some shared minizip/fmt
This commit is contained in:
Léo Lam 2020-03-15 16:25:11 +01:00 committed by GitHub
commit 5db7add9c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions

View File

@ -588,8 +588,14 @@ else()
add_subdirectory(Externals/zlib)
endif()
add_subdirectory(Externals/minizip)
include_directories(External/minizip)
pkg_check_modules(MINIZIP minizip)
if(MINIZIP_FOUND)
message(STATUS "Using shared minizip")
else()
message(STATUS "Shared minizip not found, falling back to the static library")
add_subdirectory(Externals/minizip)
include_directories(External/minizip)
endif()
if(NOT APPLE)
check_lib(LZO "(no .pc for lzo2)" lzo2 lzo/lzo1x.h QUIET)