From: Dominik Schmidt <dev@dominik-schmidt.de>
Date: Fri, 22 Sep 2017 08:45:40 +0000 (+0200)
Subject: Set CMAKE_INSTALL_RPATH as RPATH for installed executables
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~701^2~29
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bdd3dc743b1a7117e758ae5dd5ba4495139e485c;p=nextcloud-desktop.git

Set CMAKE_INSTALL_RPATH as RPATH for installed executables
---

diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt
index 26b641f21..50a8e743f 100644
--- 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 bf577b454..d8b2b7745 100644
--- 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 77b32ba1a..eeb8fa0a9 100644
--- 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} )