forked from pool/nextcloud-desktop
Eric Schirra
45d2ae67af
Update to 2.6.5 OBS-URL: https://build.opensuse.org/request/show/819778 OBS-URL: https://build.opensuse.org/package/show/network/nextcloud-desktop?expand=0&rev=16
77 lines
4.1 KiB
Diff
77 lines
4.1 KiB
Diff
Index: desktop-2.6.5/src/cmd/CMakeLists.txt
|
|
===================================================================
|
|
--- desktop-2.6.5.orig/src/cmd/CMakeLists.txt
|
|
+++ desktop-2.6.5/src/cmd/CMakeLists.txt
|
|
@@ -23,8 +23,13 @@ if(NOT BUILD_LIBRARIES_ONLY)
|
|
add_executable(${cmd_NAME} ${cmd_SRC})
|
|
set_target_properties(${cmd_NAME} PROPERTIES
|
|
RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} )
|
|
- set_target_properties(${cmd_NAME} PROPERTIES
|
|
- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
|
|
+ if(LIB_INSTALL_DIR MATCHES "^/")
|
|
+ set_target_properties(${cmd_NAME} PROPERTIES
|
|
+ INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
|
|
+ else()
|
|
+ set_target_properties(${cmd_NAME} PROPERTIES
|
|
+ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
|
|
+ endif()
|
|
|
|
target_link_libraries(${cmd_NAME} ocsync ${synclib_NAME} Qt5::Core Qt5::Network)
|
|
|
|
Index: desktop-2.6.5/src/crashreporter/CMakeLists.txt
|
|
===================================================================
|
|
--- desktop-2.6.5.orig/src/crashreporter/CMakeLists.txt
|
|
+++ desktop-2.6.5/src/crashreporter/CMakeLists.txt
|
|
@@ -29,7 +29,11 @@ if(NOT BUILD_LIBRARIES_ONLY)
|
|
target_include_directories(${CRASHREPORTER_EXECUTABLE} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
|
|
set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES AUTOMOC ON)
|
|
set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} )
|
|
- set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
|
|
+ if(LIB_INSTALL_DIR MATCHES "^/")
|
|
+ set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
|
|
+ else()
|
|
+ set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
|
|
+ endif()
|
|
target_link_libraries(${CRASHREPORTER_EXECUTABLE}
|
|
crashreporter-gui
|
|
Qt5::Core Qt5::Widgets
|
|
Index: desktop-2.6.5/src/gui/CMakeLists.txt
|
|
===================================================================
|
|
--- desktop-2.6.5.orig/src/gui/CMakeLists.txt
|
|
+++ desktop-2.6.5/src/gui/CMakeLists.txt
|
|
@@ -310,8 +310,13 @@ set_target_properties( ${APPLICATION_EXE
|
|
RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY}
|
|
)
|
|
# Only relevant for Linux? On OS X it by default properly checks in the bundle directory next to the exe
|
|
-set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
|
|
+if(LIB_INSTALL_DIR MATCHES "^/")
|
|
+ set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
|
|
+ INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
|
|
+else()
|
|
+ set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
|
|
INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
|
|
+endif()
|
|
|
|
target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Network Qt5::Xml Qt5::WebEngineWidgets)
|
|
target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
|
|
Index: desktop-2.6.5/src/libsync/CMakeLists.txt
|
|
===================================================================
|
|
--- desktop-2.6.5.orig/src/libsync/CMakeLists.txt
|
|
+++ desktop-2.6.5/src/libsync/CMakeLists.txt
|
|
@@ -130,8 +130,13 @@ set_target_properties( ${synclib_NAME}
|
|
SOVERSION ${MIRALL_SOVERSION}
|
|
RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY}
|
|
)
|
|
-set_target_properties( ${synclib_NAME} PROPERTIES
|
|
- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
|
|
+if(LIB_INSTALL_DIR MATCHES "^/")
|
|
+ set_target_properties( ${synclib_NAME} PROPERTIES
|
|
+ INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
|
|
+else()
|
|
+ set_target_properties( ${synclib_NAME} PROPERTIES
|
|
+ INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
|
|
+endif()
|
|
|
|
if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
|
|
install(TARGETS ${synclib_NAME}
|