From 15c829fd3ce0de04db938566a56e66531c320580 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 6 May 2017 17:22:14 +0200 Subject: GH-1876 Fork and update quazip * It is added as a new submodule: https://github.com/MultiMC/quazip/tree/multimc-1 * Its build system has been entirely replaced to remove the existing issues with it * It now has working unit tests * No more patches needed * It has a static linking exception in its license now, but we use it shared anyway --- quazip.patch | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 quazip.patch (limited to 'quazip.patch') diff --git a/quazip.patch b/quazip.patch deleted file mode 100644 index deab6dab..00000000 --- a/quazip.patch +++ /dev/null @@ -1,32 +0,0 @@ -Index: CMakeLists.txt -=================================================================== ---- CMakeLists.txt (revision 250) -+++ CMakeLists.txt (working copy) -@@ -51,4 +51,4 @@ - - add_subdirectory(quazip) - --install(FILES FindQuaZip.cmake DESTINATION ${CMAKE_ROOT}/Modules) -+#install(FILES FindQuaZip.cmake DESTINATION ${CMAKE_ROOT}/Modules) -Index: quazip/CMakeLists.txt -=================================================================== ---- quazip/CMakeLists.txt (revision 250) -+++ quazip/CMakeLists.txt (working copy) -@@ -14,10 +14,14 @@ - qt_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS}) - set(SRCS ${SRCS} ${MOC_SRCS}) - --add_library(quazip SHARED ${SRCS}) --set_target_properties(quazip PROPERTIES VERSION 1.0.0 SOVERSION 1) -+add_library(quazip STATIC ${SRCS}) -+#set_target_properties(quazip PROPERTIES VERSION 1.0.0 SOVERSION 1) - # Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty) --target_link_libraries(quazip ${QT_QTMAIN_LIBRARY} ${QT_QTCORE_LIBRARY} ${ZLIB_LIBRARIES}) -+target_link_libraries(quazip ${ZLIB_LIBRARIES}) -+qt5_use_modules(quazip Core) -+if(WIN32) -+ add_definitions(-DZ_PREFIX) -+endif() - - install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip) - install(TARGETS quazip LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) \ No newline at end of file -- cgit v1.2.3