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

[tfry at users.sourceforge.net]

Revision: 2318
          http://rkward.svn.sourceforge.net/rkward/?rev=2318&view=rev
Author:   tfry
Date:     2008-01-16 05:51:46 -0800 (Wed, 16 Jan 2008)

Log Message:
-----------
(Try to) fix up FindR.cmake

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/rbackend/FindR.cmake

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2008-01-14 21:08:14 UTC (rev 2317)
+++ trunk/rkward/ChangeLog	2008-01-16 13:51:46 UTC (rev 2318)
@@ -11,7 +11,6 @@
 ---- KDE 3 versions
 
 --- Version 0.4.9 - Jan-14-2008
-
 - Improved user interface for CSV import plugin
 - Support drawing grids in histogram and stripchart plots
 - New plugin: Levene test

Modified: trunk/rkward/rkward/rbackend/FindR.cmake
===================================================================
--- trunk/rkward/rkward/rbackend/FindR.cmake	2008-01-14 21:08:14 UTC (rev 2317)
+++ trunk/rkward/rkward/rbackend/FindR.cmake	2008-01-16 13:51:46 UTC (rev 2318)
@@ -133,6 +133,11 @@
 	"" R_LIBDIR
 	"${R_LIBDIR}")
 
+# strip trailing colon(s)
+STRING(REGEX REPLACE ":+$"
+	"" R_LIBDIR
+	"${R_LIBDIR}")
+
 # find first path
 STRING(REGEX REPLACE ":"
 	" " R_LIBDIR
@@ -146,6 +151,7 @@
 	IF(NOT USE_R_LIBDIR)
 		IF(EXISTS ${CURRENTDIR})
 			SET(R_LIBDIR ${CURRENTDIR})
+			SET(USE_R_LIBDIR 1)
 		ELSE(EXISTS ${CURRENTDIR})
 			MESSAGE(STATUS "${CURRENTDIR} does not exist. Skipping")
 		ENDIF(EXISTS ${CURRENTDIR})


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.