From 4549a01f5666462c0e8231a6ec8d9bd33edf3aff Mon Sep 17 00:00:00 2001 From: Moritz Schlarb Date: Thu, 24 May 2018 16:28:02 +0200 Subject: [PATCH] Don't use bundled QuaZip Gbp-Pq: Name 0002-Don-t-use-bundled-QuaZip.patch --- CMakeLists.txt | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2bba5f2..2f53344 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -206,8 +206,6 @@ if (APPLE) SET(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++") endif() -ADD_DEFINITIONS(-DQUAZIP_STATIC) - # MOC FILES SET(moc_headers src/seafile-applet.h @@ -293,7 +291,6 @@ SET(moc_headers src/filebrowser/transfer-mgr.h src/filebrowser/thumbnail-service.h third_party/QtAwesome/QtAwesome.h - third_party/quazip/quazipfile.h ${platform_specific_moc_headers} ) @@ -499,7 +496,6 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/third_party/QtAwesome - ${CMAKE_CURRENT_SOURCE_DIR}/third_party/quazip ) FOREACH(USE_QT_LIBRARY ${USE_QT_LIBRARIES}) @@ -593,27 +589,12 @@ ENDIF() ADD_SC_LIBRARY(utils ${utils_sources}) -# library quazip -LIST(APPEND quazip_sources - third_party/quazip/JlCompress.cpp - third_party/quazip/quazip.cpp - third_party/quazip/quazipfile.cpp - third_party/quazip/quazipfileinfo.cpp - third_party/quazip/quaziodevice.cpp - third_party/quazip/quagzipfile.cpp - third_party/quazip/quazipnewinfo.cpp - third_party/quazip/quaadler32.cpp - third_party/quazip/quazipdir.cpp - third_party/quazip/quacrc32.cpp - third_party/quazip/qioapi.cpp - third_party/quazip/zip.c - third_party/quazip/unzip.c - ) - -ADD_SC_LIBRARY(quazip ${quazip_sources}) +SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "/usr/share/quazip") +FIND_PACKAGE(QuaZip5 REQUIRED) +INCLUDE_DIRECTORIES(${QUAZIP_INCLUDE_DIRS}) +SET(EXTRA_LIBS ${EXTRA_LIBS} ${QUAZIP_LIBRARIES}) -SET(SC_LIBS utils quazip) -#SET(SC_LIBS utils) +SET(SC_LIBS utils) #################### ###### end: lib -- 2.30.2