Lines 1-24
Link Here
|
1 |
--- CMakeLists.txt.orig 2015-02-05 08:43:51 UTC |
1 |
--- CMakeLists.txt.orig 2016-04-29 04:32:14 UTC |
2 |
+++ CMakeLists.txt |
2 |
+++ CMakeLists.txt |
3 |
@@ -98,7 +98,7 @@ IF(USE_QT5) |
3 |
@@ -81,7 +81,7 @@ IF (WIN32) |
4 |
SET(USE_QT_LIBRARIES ${USE_QT_LIBRARIES} "WebKit" "WebKitWidgets") |
|
|
5 |
ADD_DEFINITIONS(-DHAVE_SHIBBOLETH_SUPPORT) |
6 |
ENDIF() |
4 |
ENDIF() |
7 |
- IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux") |
5 |
SET(platform_specific_moc_headers src/ext-handler.h) |
8 |
+ IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "BSD|DragonFly") |
6 |
SET(platform_specific_sources src/ext-handler.cpp) |
9 |
SET(USE_QT_LIBRARIES ${USE_QT_LIBRARIES} "DBus") |
7 |
-ELSEIF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "BSD") |
10 |
ENDIF() |
8 |
+ELSEIF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "BSD|DragonFly") |
11 |
FIND_PACKAGE(Qt5 REQUIRED ${USE_QT_LIBRARIES}) |
9 |
INCLUDE_DIRECTORIES(${QT_QTDBUS_INCLUDE_DIR}) |
12 |
@@ -113,7 +113,7 @@ ELSE() |
10 |
LINK_DIRECTORIES(${QT_QTDBUS_LIBRARIES}) |
13 |
SET(QtWebKit "QtWebKit") |
11 |
SET(EXTRA_LIBS ${EXTRA_LIBS} ${QT_QTDBUS_LIBRARIES}) |
14 |
ADD_DEFINITIONS(-DHAVE_SHIBBOLETH_SUPPORT) |
12 |
@@ -318,7 +318,7 @@ PKG_CHECK_MODULES(LIBCCNET REQUIRED libc |
15 |
ENDIF() |
|
|
16 |
- IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux") |
17 |
+ IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "BSD|DragonFly") |
18 |
SET(QtDBus "QtDBus") |
19 |
ENDIF() |
20 |
FIND_PACKAGE(Qt4 REQUIRED QtCore QtGui QtNetwork ${QtDBus} ${QtWebKit}) |
21 |
@@ -263,7 +263,7 @@ PKG_CHECK_MODULES(LIBCCNET REQUIRED libc |
22 |
|
13 |
|
23 |
PKG_CHECK_MODULES(LIBSEARPC REQUIRED libsearpc>=1.0) |
14 |
PKG_CHECK_MODULES(LIBSEARPC REQUIRED libsearpc>=1.0) |
24 |
|
15 |
|
Lines 26-29
Link Here
|
26 |
+#PKG_CHECK_MODULES(OPENSSL REQUIRED openssl>=0.98) |
17 |
+#PKG_CHECK_MODULES(OPENSSL REQUIRED openssl>=0.98) |
27 |
|
18 |
|
28 |
PKG_CHECK_MODULES(LIBSEAFILE REQUIRED libseafile>=1.7) |
19 |
PKG_CHECK_MODULES(LIBSEAFILE REQUIRED libseafile>=1.7) |
29 |
#################### |
20 |
|
|
|
21 |
@@ -515,7 +515,7 @@ IF (WIN32) |
22 |
src/utils/registry.cpp |
23 |
src/utils/utils-win.cpp |
24 |
) |
25 |
-ELSEIF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "BSD") |
26 |
+ELSEIF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "BSD|DragonFly") |
27 |
LIST(APPEND utils_sources |
28 |
src/utils/process-linux.cpp |
29 |
) |
30 |
@@ -714,7 +714,7 @@ QT5_USE_MODULES(seafile-applet ${WEBKIT_ |
31 |
ENDIF() |
32 |
|
33 |
## QtBus |
34 |
-IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "BSD") |
35 |
+IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "BSD|DragonFly") |
36 |
TARGET_LINK_LIBRARIES(seafile-applet |
37 |
${QT_QTDBUS_LIBRARIES} |
38 |
) |