[Pkg-owncloud-commits] [owncloud-client] 12/103: Install ocsync library to private lib directory, use rpath to find it.

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 30a14b9f45bd1fa971aef9926da742927c76be9f
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Fri Apr 11 13:27:41 2014 +0200

    Install ocsync library to private lib directory, use rpath to find it.
---
 csync/src/CMakeLists.txt |  6 +++---
 src/CMakeLists.txt       | 11 ++++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/csync/src/CMakeLists.txt b/csync/src/CMakeLists.txt
index 6a6cfdd..d28f9e2 100644
--- a/csync/src/CMakeLists.txt
+++ b/csync/src/CMakeLists.txt
@@ -115,11 +115,11 @@ INSTALL(
   TARGETS
     ${CSYNC_LIBRARY}
   LIBRARY DESTINATION
-    ${LIB_INSTALL_DIR}
+    ${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}
   ARCHIVE DESTINATION
-    ${LIB_INSTALL_DIR}
+    ${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}
   RUNTIME DESTINATION
-    ${BIN_INSTALL_DIR}
+    ${BIN_INSTALL_DIR}/${APPLICATION_EXECUTABLE}
 )
 
 # INSTALL(
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cbac5d5..310fa74 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -201,6 +201,8 @@ set_target_properties( ${synclib_NAME}  PROPERTIES
 	VERSION ${MIRALL_VERSION}
 	SOVERSION ${MIRALL_SOVERSION}
 )
+set_target_properties( ${synclib_NAME} PROPERTIES
+	INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
 
 target_link_libraries(${synclib_NAME} ${libsync_LINK_TARGETS} )
 
@@ -426,6 +428,9 @@ if(NOT BUILD_LIBRARIES_ONLY)
   set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
           RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY}
   )
+  set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
+	  INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
+
   target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} )
   target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
   target_link_libraries( ${APPLICATION_EXECUTABLE} updater )
@@ -464,10 +469,14 @@ endif()
 set(owncloudcmd_NAME ${APPLICATION_EXECUTABLE}cmd)
 set(OWNCLOUDCMD_SRC owncloudcmd/simplesslerrorhandler.cpp owncloudcmd/owncloudcmd.cpp)
 if(NOT BUILD_LIBRARIES_ONLY)
+
    add_executable(${owncloudcmd_NAME}  ${OWNCLOUDCMD_SRC})
 	qt5_use_modules(${owncloudcmd_NAME} Network Sql)
 	set_target_properties(${owncloudcmd_NAME} PROPERTIES
-		        RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY} )
+	        RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY} )
+        set_target_properties(${owncloudcmd_NAME} PROPERTIES
+		INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
+
 	target_link_libraries(${owncloudcmd_NAME} ${synclib_NAME})
 endif()
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git