updated rcroot to use new patch. rc2 package loaded silently. compile…

…s with debug flag since open source, makes easier to debug stack trace from deployment
rc2server · Feb 8, 2018 · 8676249 · 8676249
1 parent 818c3e6
commit 8676249
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -30,7 +30,7 @@ set_property(GLOBAL PROPERTY CXX_STANDARD 11)
 set_property(GLOBAL PROPERTY CXX_STANDARD_REQUIRED ON)
 
 add_definitions(-std=c++11)
-SET(CMAKE_CXX_FLAGS "-std=c++11 -DBOOST_LOG_DYN_LINK")
+SET(CMAKE_CXX_FLAGS "-std=c++11 -DBOOST_LOG_DYN_LINK -g")
 #following fixes compile error because somehow -rdynamic is getting set as a linker flag
 SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS)
 SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "-Wl,--no-export-dynamic -lstdc++")

diff --git a/rc2root b/rc2root
diff --git a/src/RSession.cpp b/src/RSession.cpp
@@ -497,7 +497,7 @@ RC2::RSession::handleOpenCommand(JsonCommand &cmd)
 		_impl->ignoreOutput = true;
 		_impl->R->parseEvalQNT("library(rmarkdown)");
 		_impl->R->parseEvalQNT("library(tools)");
-		_impl->R->parseEvalQNT("library(rc2)");
+		_impl->R->parseEvalQNT("library(rc2, quietly = TRUE)");
 		_impl->R->parseEvalQNT("rm(argv)"); //RInside creates this even though we passed NULL
 		_impl->R->parseEvalQNT("options(device = \"rc2.pngdev\", bitmapType = \"cairo\")");
 		_impl->R->parseEvalQNT("source(\"" + escape_quotes(ourCodePath) + "\", keep.source=FALSE)");