Set CMAKE_INSTALL_RPATH as RPATH for installed executables

diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt
index 26b641f217dfa67c13aceaab30bec2f9ba949344..50a8e743fd050c23b7c941e294d4bb8d24e220f8 100644 (file)
--- a/src/cmd/CMakeLists.txt
+++ b/src/cmd/CMakeLists.txt
@@ -25,7 +25,7 @@ if(NOT BUILD_LIBRARIES_ONLY)
        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}" )
+               INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
 
        target_link_libraries(${cmd_NAME} ${synclib_NAME})
 endif()

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index bf577b454af58d56fb52632f3e5c66b5a9b7ceb5..d8b2b774555eec97433d36d4f0205b924249da0b 100644 (file)
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -291,7 +291,7 @@ set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
 )
 # 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
-       INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
+       INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
 
 target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} )
 target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )

diff --git a/src/libsync/CMakeLists.txt b/src/libsync/CMakeLists.txt
index 77b32ba1a2cb051facb4231aecbb1cc7ecec42f7..eeb8fa0a94d28a96a05698a79fb7060394d5edb1 100644 (file)
--- a/src/libsync/CMakeLists.txt
+++ b/src/libsync/CMakeLists.txt
@@ -131,7 +131,7 @@ set_target_properties( ${synclib_NAME}  PROPERTIES
        RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY}
 )
 set_target_properties( ${synclib_NAME} PROPERTIES
-       INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
+       INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
 
 target_link_libraries(${synclib_NAME} ${libsync_LINK_TARGETS} )