Skip to content

Commit

Permalink
Merge pull request dolphin-emu#8667 from Mystro256/master
Browse files Browse the repository at this point in the history
Allow for some shared minizip/fmt
  • Loading branch information
leoetlino authored Mar 15, 2020
2 parents 19a46dd + 9f12e0f commit 5db7add
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 5db7add

Please sign in to comment.