[rkward-cvs] SF.net SVN: rkward-code:[4703] trunk/rkward/rkward/settings/ rksettingsmoduler.cpp

[tfry at users.sf.net]

Revision: 4703
          http://sourceforge.net/p/rkward/code/4703
Author:   tfry
Date:     2013-04-16 15:39:12 +0000 (Tue, 16 Apr 2013)
Log Message:
-----------
The frontend can't use the compile-time R version information. Here's how to query the running version of R, instead.

Modified Paths:
--------------
    trunk/rkward/rkward/settings/rksettingsmoduler.cpp

Modified: trunk/rkward/rkward/settings/rksettingsmoduler.cpp
===================================================================
--- trunk/rkward/rkward/settings/rksettingsmoduler.cpp	2013-04-16 15:06:45 UTC (rev 4702)
+++ trunk/rkward/rkward/settings/rksettingsmoduler.cpp	2013-04-16 15:39:12 UTC (rev 4703)
@@ -38,6 +38,7 @@
 #include "../misc/rkprogresscontrol.h"
 #include "../misc/rkcommonfunctions.h"
 #include "../rbackend/rinterface.h"
+#include "../rbackend/rksessionvars.h"
 #include "../rkglobals.h"
 #include "../debug.h"
 
@@ -484,12 +485,12 @@
 #	if defined Q_WS_WIN
 	else ret.append ("win.binary");
 #	else
-#		if R_VERSION < R_Version(3,0,0)
-	else ret.append ("mac.binary.leopard");
-#		else
-	// OS X binary packages have switched repo locations and package type in R >= 3.0.0
-	else ret.append ("mac.binary");
-#		endif
+	else if (RKSessionVars::compareRVersion ("3.0.0") < 0) {
+		ret.append ("mac.binary.leopard");
+	} else {
+		// OS X binary packages have switched repo locations and package type in R >= 3.0.0
+		ret.append ("mac.binary");
+	}
 #	endif
 	ret.append ("\")\n");
 #endif