[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [cantor/KDE/4.13] src/backends/R: avoid using rpath in the R backend
From:       Alexander Rieder <alexanderrieder () gmail ! com>
Date:       2014-03-19 22:45:58
Message-ID: E1WQPFG-0008A8-A9 () scm ! kde ! org
[Download RAW message or body]

Git commit b17da18ebbdc90901ae54c18d42f3e4d07a57c65 by Alexander Rieder.
Committed on 19/03/2014 at 22:37.
Pushed by arieder into branch 'KDE/4.13'.

avoid using rpath in the R backend

patch by Modestas Vainius <modax@debian.org>, thanks.
REVIEW: 116631

M  +1    -0    src/backends/R/CMakeLists.txt
M  +1    -0    src/backends/R/rserver/CMakeLists.txt

http://commits.kde.org/cantor/b17da18ebbdc90901ae54c18d42f3e4d07a57c65

diff --git a/src/backends/R/CMakeLists.txt b/src/backends/R/CMakeLists.txt
index 5da0026..22e42b9 100644
--- a/src/backends/R/CMakeLists.txt
+++ b/src/backends/R/CMakeLists.txt
@@ -21,6 +21,7 @@ QT4_ADD_DBUS_INTERFACE(RBackend_SRCS ${network_xml} \
rserver_interface )  kde4_add_ui_files(RBackend_SRCS settings.ui)
 
 kde4_add_plugin( cantor_rbackend ${RBackend_SRCS} )
+set_target_properties( cantor_rbackend PROPERTIES INSTALL_RPATH_USE_LINK_PATH false)
 target_link_libraries( cantor_rbackend ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} \
cantorlibs ${R_USED_LIBS})  
 install( FILES rbackend.desktop  DESTINATION ${SERVICES_INSTALL_DIR}/cantor)
diff --git a/src/backends/R/rserver/CMakeLists.txt \
b/src/backends/R/rserver/CMakeLists.txt index 4f9ca90..7cd0c22 100644
--- a/src/backends/R/rserver/CMakeLists.txt
+++ b/src/backends/R/rserver/CMakeLists.txt
@@ -17,6 +17,7 @@ add_custom_target(renvvars COMMAND ${R_EXECUTABLE} --slave \
--file=${CMAKE_CURREN  add_custom_target(rautoloads COMMAND ${R_EXECUTABLE} --slave \
--file=${CMAKE_CURRENT_SOURCE_DIR}/tools/autoloads.r > \
${CMAKE_CURRENT_BINARY_DIR}/rautoloads.h )  
 kde4_add_executable( cantor_rserver ${RServer_SRCS} )
+set_target_properties( cantor_rserver PROPERTIES INSTALL_RPATH_USE_LINK_PATH false)
 target_link_libraries( cantor_rserver ${KDE4_KDEUI_LIBS} cantorlibs ${R_LIBRARIES} \
${KDE4_KIO_LIBS})  add_dependencies(cantor_rserver renvvars rautoloads)
 


[prev in list] [next in list] [prev in thread] [next in thread]