|
 |
18140be |
diff -ur owncloudclient-2.0.1.orig/src/cmd/CMakeLists.txt owncloudclient-2.0.1/src/cmd/CMakeLists.txt
|
|
|
18140be |
--- owncloudclient-2.0.1.orig/src/cmd/CMakeLists.txt 2015-09-08 19:26:20.631229885 +0300
|
|
|
18140be |
+++ owncloudclient-2.0.1/src/cmd/CMakeLists.txt 2015-09-08 19:36:50.369513888 +0300
|
|
|
225efd0 |
@@ -23,7 +23,7 @@
|
|
|
225efd0 |
set_target_properties(${cmd_NAME} PROPERTIES
|
|
|
225efd0 |
RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} )
|
|
|
225efd0 |
set_target_properties(${cmd_NAME} PROPERTIES
|
|
|
225efd0 |
- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
|
|
|
225efd0 |
+ INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
|
|
|
225efd0 |
|
|
|
225efd0 |
target_link_libraries(${cmd_NAME} ${synclib_NAME})
|
|
|
225efd0 |
endif()
|
|
|
18140be |
diff -ur owncloudclient-2.0.1.orig/src/crashreporter/CMakeLists.txt owncloudclient-2.0.1/src/crashreporter/CMakeLists.txt
|
|
|
18140be |
--- owncloudclient-2.0.1.orig/src/crashreporter/CMakeLists.txt 2015-09-08 19:26:20.631229885 +0300
|
|
|
18140be |
+++ owncloudclient-2.0.1/src/crashreporter/CMakeLists.txt 2015-09-08 19:37:14.124735192 +0300
|
|
|
225efd0 |
@@ -36,7 +36,7 @@
|
|
|
225efd0 |
|
|
|
225efd0 |
set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES AUTOMOC ON)
|
|
|
225efd0 |
set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} )
|
|
|
225efd0 |
- set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
|
|
|
225efd0 |
+ set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
|
|
|
225efd0 |
target_link_libraries(${CRASHREPORTER_EXECUTABLE}
|
|
|
225efd0 |
crashreporter-gui
|
|
|
225efd0 |
${QT_LIBRARIES}
|
|
|
18140be |
diff -ur owncloudclient-2.0.1.orig/src/gui/CMakeLists.txt owncloudclient-2.0.1/src/gui/CMakeLists.txt
|
|
|
18140be |
--- owncloudclient-2.0.1.orig/src/gui/CMakeLists.txt 2015-09-08 19:26:20.632229887 +0300
|
|
|
18140be |
+++ owncloudclient-2.0.1/src/gui/CMakeLists.txt 2015-09-08 19:38:05.229865174 +0300
|
|
|
18140be |
@@ -261,7 +261,7 @@
|
|
|
225efd0 |
)
|
|
|
225efd0 |
# Only relevant for Linux? On OS X it by default properly checks in the bundle directory next to the exe
|
|
|
225efd0 |
set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
|
|
|
225efd0 |
- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
|
|
|
225efd0 |
+ INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
|
|
|
225efd0 |
|
|
|
225efd0 |
target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} )
|
|
|
225efd0 |
target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
|
|
|
18140be |
diff -ur owncloudclient-2.0.1.orig/src/libsync/CMakeLists.txt owncloudclient-2.0.1/src/libsync/CMakeLists.txt
|
|
|
18140be |
--- owncloudclient-2.0.1.orig/src/libsync/CMakeLists.txt 2015-09-08 19:26:20.635229893 +0300
|
|
|
18140be |
+++ owncloudclient-2.0.1/src/libsync/CMakeLists.txt 2015-09-08 19:38:22.900903722 +0300
|
|
|
18140be |
@@ -158,7 +158,7 @@
|
|
|
225efd0 |
RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY}
|
|
|
225efd0 |
)
|
|
|
225efd0 |
set_target_properties( ${synclib_NAME} PROPERTIES
|
|
|
225efd0 |
- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
|
|
|
225efd0 |
+ INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
|
|
|
225efd0 |
|
|
|
225efd0 |
target_link_libraries(${synclib_NAME} ${libsync_LINK_TARGETS} )
|
|
|
225efd0 |
|