add R_LIBS for windows and macos

jasp-stats · Nov 30, 2023 · 34cbab4 · 34cbab4
1 parent d371dca
commit 34cbab4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Desktop/utilities/processhelper.cpp b/Desktop/utilities/processhelper.cpp
@@ -54,7 +54,7 @@ QProcessEnvironment ProcessHelper::getProcessEnvironmentForJaspEngine()
 
 #undef ARCH_SUBPATH
 
-	env.insert("R_LIBS",			 R_HOME + "/library");
+	env.insert("R_LIBS",			 programDir.absoluteFilePath("../R/R_cpp_includes_library") + ";" + R_HOME + "/library");
 
 	env.insert("R_ENVIRON",			"something-which-doesn't-exist");
 	env.insert("R_PROFILE",			"something-which-doesn't-exist");
@@ -72,7 +72,7 @@ QProcessEnvironment ProcessHelper::getProcessEnvironmentForJaspEngine()
 	env.insert("R_HOME",			rHome.absolutePath());
 	env.insert("RHOME",				rHome.absolutePath()); //For Rscript
 	env.insert("JASP_R_HOME",		rHome.absolutePath()); //Used by the modified R script in jasp-required-files/Framework/etc/bin to make sure we use the actual R of JASP! (https://github.com/jasp-stats/INTERNAL-jasp/issues/452)
-	env.insert("R_LIBS",			rHome.absoluteFilePath("library") + ":" + programDir.absoluteFilePath("R/library"));
+	env.insert("R_LIBS",			programDir.absoluteFilePath("../R/R_cpp_includes_library") + ":" + rHome.absoluteFilePath("library") + ":" + programDir.absoluteFilePath("R/library") + custom_R_library);
 	env.insert("JAGS_HOME",			rHome.absolutePath() + "/opt/jags/lib/JAGS/");
 	// env.insert("JAGS_LIBDIR",		rHome.absolutePath() + "/opt/jags/lib/");