Always use the bundled libzip to avoid compatibility issues. Should fix #10575

This commit is contained in:
Henrik Rydgård 2018-02-06 19:41:00 +01:00
parent a41422afbd
commit 1a34f88331

View File

@ -545,10 +545,6 @@ if (NOT MSVC)
endif()
find_package(LibZip)
if(LIBZIP_FOUND)
add_definitions(-DSHARED_LIBZIP)
else()
add_library(libzip STATIC
ext/native/ext/libzip/zip.h
ext/native/ext/libzip/mkstemp.c
@ -608,7 +604,6 @@ else()
target_link_libraries(libzip)
include_directories(ext/native/ext/libzip)
set(LIBZIP_LIBRARY libzip)
endif()
# FindPNG does a few things we don't want. So do it ourselves. Fixed to libpng17
find_path(PNG_PNG_INCLUDE_DIR NAMES "libpng17/png.h")