From 8676249261e8eea783e19b77400650ed65f4d614 Mon Sep 17 00:00:00 2001 From: Mark Lilback Date: Thu, 8 Feb 2018 10:00:21 -0500 Subject: [PATCH] updated rcroot to use new patch. rc2 package loaded silently. compiles with debug flag since open source, makes easier to debug stack trace from deployment --- CMakeLists.txt | 2 +- rc2root | 2 +- src/RSession.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6334fa8..0cd0309 100644 --- 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 index 5491da9..d86ccec 160000 --- a/rc2root +++ b/rc2root @@ -1 +1 @@ -Subproject commit 5491da918261a0266607338acdc776b39b66b090 +Subproject commit d86ccecebadcdcb706dddc923ff73655efc039d3 diff --git a/src/RSession.cpp b/src/RSession.cpp index 1bedeef..9956e15 100644 --- 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)");