1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
From: Moritz Schlarb <schlarbm@uni-mainz.de>
Date: Thu, 24 May 2018 16:28:02 +0200
Subject: Don't use bundled QuaZip
Forwarded: not-needed
---
CMakeLists.txt | 28 ++++------------------------
1 file changed, 4 insertions(+), 24 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa1277f..edf70fa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -200,8 +200,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
@@ -288,7 +286,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}
)
@@ -513,7 +510,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})
@@ -613,27 +609,11 @@ 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})
+FIND_PACKAGE(QuaZip5 REQUIRED PATHS "/usr/share/quazip")
+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
|
