[Pkg-owncloud-commits] [owncloud-client] 149/211: CMake: Fix RPATH

Sandro Knauß hefee-guest at moszumanska.debian.org
Sat Oct 25 09:10:39 UTC 2014


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 1af480ea3b9abc89c9d9e3cd6718b94a7b07a339
Author: Markus Goetz <markus at woboq.com>
Date:   Tue Oct 21 15:39:13 2014 +0200

    CMake: Fix RPATH
---
 src/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 08beb8f..bba0760 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -389,8 +389,9 @@ if(NOT BUILD_LIBRARIES_ONLY)
   set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
           RUNTIME_OUTPUT_DIRECTORY  ${BIN_OUTPUT_DIRECTORY}
   )
+  # 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}/" )
+          INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
 
 
   target_link_libraries( ${APPLICATION_EXECUTABLE} ${QT_LIBRARIES} )

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



More information about the Pkg-owncloud-commits mailing list