|
 |
36cf52c |
diff -urNr client-2.1.1-orig/src/cmd/CMakeLists.txt client-2.1.1/src/cmd/CMakeLists.txt
|
|
|
36cf52c |
--- client-2.1.1-orig/src/cmd/CMakeLists.txt 2016-02-09 16:07:08.000000000 +0100
|
|
|
36cf52c |
+++ client-2.1.1/src/cmd/CMakeLists.txt 2016-02-10 18:51:41.972455649 +0100
|
|
|
36cf52c |
@@ -23,7 +23,7 @@
|
|
|
36cf52c |
set_target_properties(${cmd_NAME} PROPERTIES
|
|
|
36cf52c |
RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} )
|
|
|
36cf52c |
set_target_properties(${cmd_NAME} PROPERTIES
|
|
|
36cf52c |
- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
|
|
|
36cf52c |
+ INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
|
|
|
36cf52c |
|
|
|
36cf52c |
target_link_libraries(${cmd_NAME} ${synclib_NAME})
|
|
|
36cf52c |
endif()
|
|
|
36cf52c |
diff -urNr client-2.1.1-orig/src/crashreporter/CMakeLists.txt client-2.1.1/src/crashreporter/CMakeLists.txt
|
|
|
36cf52c |
--- client-2.1.1-orig/src/crashreporter/CMakeLists.txt 2016-02-09 16:07:08.000000000 +0100
|
|
|
36cf52c |
+++ client-2.1.1/src/crashreporter/CMakeLists.txt 2016-02-10 18:52:30.890390103 +0100
|
|
|
36cf52c |
@@ -36,7 +36,7 @@
|
|
|
36cf52c |
|
|
|
36cf52c |
set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES AUTOMOC ON)
|
|
|
36cf52c |
set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} )
|
|
|
36cf52c |
- set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
|
|
|
36cf52c |
+ set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
|
|
|
36cf52c |
target_link_libraries(${CRASHREPORTER_EXECUTABLE}
|
|
|
36cf52c |
crashreporter-gui
|
|
|
36cf52c |
${QT_LIBRARIES}
|
|
|
36cf52c |
diff -urNr client-2.1.1-orig/src/gui/CMakeLists.txt client-2.1.1/src/gui/CMakeLists.txt
|
|
|
36cf52c |
--- client-2.1.1-orig/src/gui/CMakeLists.txt 2016-02-09 16:07:08.000000000 +0100
|
|
|
36cf52c |
+++ client-2.1.1/src/gui/CMakeLists.txt 2016-02-10 18:53:20.748304082 +0100
|
|
|
36cf52c |
@@ -276,7 +276,7 @@
|
|
|
36cf52c |
)
|
|
|
36cf52c |
# Only relevant for Linux? On OS X it by default properly checks in the bundle directory next to the exe
|
|
|
36cf52c |
set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
|
|
|
36cf52c |
- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
|
|
|
36cf52c |
+ INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
|
|
|
36cf52c |
|
|
|
36cf52c |
target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} )
|
|
|
36cf52c |
target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
|
|
|
36cf52c |
diff -urNr client-2.1.1-orig/src/libsync/CMakeLists.txt client-2.1.1/src/libsync/CMakeLists.txt
|
|
|
36cf52c |
--- client-2.1.1-orig/src/libsync/CMakeLists.txt 2016-02-09 16:07:08.000000000 +0100
|
|
|
36cf52c |
+++ client-2.1.1/src/libsync/CMakeLists.txt 2016-02-10 18:54:14.004144045 +0100
|
|
|
36cf52c |
@@ -147,7 +147,7 @@
|
|
|
36cf52c |
RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY}
|
|
|
36cf52c |
)
|
|
|
36cf52c |
set_target_properties( ${synclib_NAME} PROPERTIES
|
|
|
36cf52c |
- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
|
|
|
36cf52c |
+ INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
|
|
|
36cf52c |
|
|
|
36cf52c |
target_link_libraries(${synclib_NAME} ${libsync_LINK_TARGETS} )
|
|
|
36cf52c |
|