From 47bb26fb2b8fefcfbdd1cadcc7ad4efc3d994806 Mon Sep 17 00:00:00 2001 From: Leo Date: Wed, 29 Jan 2020 11:07:41 +0100 Subject: community/libzip: upgrade to 1.6.0 --- community/libzip/build-static-and-dynamic.patch | 33 ------------------------- 1 file changed, 33 deletions(-) delete mode 100644 community/libzip/build-static-and-dynamic.patch (limited to 'community/libzip/build-static-and-dynamic.patch') diff --git a/community/libzip/build-static-and-dynamic.patch b/community/libzip/build-static-and-dynamic.patch deleted file mode 100644 index 890725ee57..0000000000 --- a/community/libzip/build-static-and-dynamic.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -59,7 +59,7 @@ - SET(WINDOWS_CRYPTO_FOUND FALSE) - ENDIF() - --OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON) -+SET(BUILD_SHARED_LIBS ON) - - - OPTION(SHARED_LIB_VERSIONNING "Add SO version in .so build" ON) ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -215,7 +215,9 @@ - ) - ENDIF() - --ADD_LIBRARY(zip ${LIBZIP_SOURCES} ${LIBZIP_EXTRA_FILES} ${LIBZIP_OPTIONAL_FILES} ${LIBZIP_OPSYS_FILES}) -+ADD_LIBRARY(zip SHARED ${LIBZIP_SOURCES} ${LIBZIP_EXTRA_FILES} ${LIBZIP_OPTIONAL_FILES} ${LIBZIP_OPSYS_FILES}) -+ADD_LIBRARY(zip_static STATIC ${LIBZIP_SOURCES} ${LIBZIP_EXTRA_FILES} ${LIBZIP_OPTIONAL_FILES} ${LIBZIP_OPSYS_FILES}) -+SET_TARGET_PROPERTIES(zip_static PROPERTIES OUTPUT_NAME zip CLEAN_DIRECT_OUTPUT 1) - - IF(SHARED_LIB_VERSIONNING) - SET_TARGET_PROPERTIES(zip PROPERTIES VERSION 5.0 SOVERSION 5) -@@ -223,7 +225,7 @@ - - - TARGET_LINK_LIBRARIES(zip ${ZLIB_LIBRARY} ${OPTIONAL_LIBRARY}) --INSTALL(TARGETS zip -+INSTALL(TARGETS zip zip_static - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) -- cgit v1.2.3