[rkward-cvs] SF.net SVN: rkward-code:[4678] trunk/rkward/rkward

[m-eik at users.sf.net]

Revision: 4678
          http://sourceforge.net/p/rkward/code/4678
Author:   m-eik
Date:     2013-04-07 18:22:11 +0000 (Sun, 07 Apr 2013)
Log Message:
-----------
building against CRAN R makes the port install its own R packages to /Library/..., which violates the policy to keep everything in the MacPorts root directory. setting -DR_LIBDIR helps, but RKWard must be told to also look there to find the rkward package. let's see if this works.

Modified Paths:
--------------
    trunk/rkward/rkward/CMakeLists.txt
    trunk/rkward/rkward/rkward.sh.in

Modified: trunk/rkward/rkward/CMakeLists.txt
===================================================================
--- trunk/rkward/rkward/CMakeLists.txt	2013-04-07 14:32:56 UTC (rev 4677)
+++ trunk/rkward/rkward/CMakeLists.txt	2013-04-07 18:22:11 UTC (rev 4678)
@@ -13,6 +13,10 @@
 if ! [ $(echo $PATH | grep ${CMAKE_INSTALL_PREFIX}) ] ; then
   export PATH=\"${CMAKE_INSTALL_PREFIX}/bin\":\"${CMAKE_INSTALL_PREFIX}/sbin\":$PATH
 fi")
+	IF(DEFINED R_LIBDIR)
+		SET(APPEND_LOCAL_RLIBS "# ensure that RKWard finds its own packages
+export R_LIBS=\"${R_LIBDIR}\"")
+	ENDIF(R_LIBDIR)
 	SET(KDE_START_DBUS "launchctl load -w \"${CMAKE_INSTALL_PREFIX}/Library/LaunchAgents/org.freedesktop.dbus-session.plist\"")
 #	SET(CPACK_BUNDLE_PLIST ${CMAKE_SOURCE_DIR}/rkward/Info.plist)
 ELSE(Q_WS_MAC)

Modified: trunk/rkward/rkward/rkward.sh.in
===================================================================
--- trunk/rkward/rkward/rkward.sh.in	2013-04-07 14:32:56 UTC (rev 4677)
+++ trunk/rkward/rkward/rkward.sh.in	2013-04-07 18:22:11 UTC (rev 4678)
@@ -43,6 +43,7 @@
 export LC_NUMERIC="C"
 
 @APPEND_LOCAL_PATH@
+ at APPEND_LOCAL_RLIBS@
 @KDE_START_DBUS@
 
 ## Start rkward. Running through R CMD to set all the relevant R enviroment variables