36 lines
1.3 KiB
Text
36 lines
1.3 KiB
Text
Index: CMakeLists.txt
|
|
--- CMakeLists.txt.orig
|
|
+++ CMakeLists.txt
|
|
@@ -133,9 +133,9 @@ ENDIF()
|
|
####################
|
|
###### BEGIN: QT configuration
|
|
####################
|
|
-FIND_PROGRAM(qmake_executable NAMES qmake qmake.exe)
|
|
+FIND_PROGRAM(qmake_executable NAMES qmake qmake.exe qmake-qt5)
|
|
EXECUTE_PROCESS(COMMAND
|
|
- bash -c "${qmake_executable} --version | grep -iE '^using qt version [0-9.]+' | awk '{print $4}'"
|
|
+ sh -c "${qmake_executable} --version | grep -iE '^using qt version [0-9.]+' | awk '{print $4}'"
|
|
OUTPUT_VARIABLE DETECTED_QT_VERSION
|
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
MESSAGE("Qt version: ${DETECTED_QT_VERSION}")
|
|
@@ -171,7 +171,7 @@ IF (BUILD_SHIBBOLETH_SUPPORT)
|
|
ADD_DEFINITIONS(-DHAVE_SHIBBOLETH_SUPPORT)
|
|
ENDIF()
|
|
|
|
-IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
|
+IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "BSD")
|
|
SET(USE_QT_LIBRARIES ${USE_QT_LIBRARIES} "DBus")
|
|
ENDIF()
|
|
|
|
@@ -799,9 +799,9 @@ ENDIF()
|
|
## QtBus
|
|
IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "BSD")
|
|
IF(QT_VERSION_MAJOR EQUAL 6)
|
|
- target_link_libraries(seafile-applet Qt6::DBus)
|
|
+ target_link_libraries(seafile-applet Qt6DBus)
|
|
ELSE()
|
|
- target_link_libraries(seafile-applet Qt5::DBus)
|
|
+ target_link_libraries(seafile-applet Qt5DBus)
|
|
ENDIF()
|
|
ENDIF()
|
|
|