From 4dbf356f5beadfdb67c915d84e12cb828ecb8263 Mon Sep 17 00:00:00 2001 From: Da Zheng Date: Wed, 13 Jan 2016 16:49:41 -0500 Subject: [PATCH] [R]: compile FlashEigen correctly when it's enabled. --- Rpkg/src/Makevars | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Rpkg/src/Makevars b/Rpkg/src/Makevars index ed9a7959..c6554c4b 100644 --- a/Rpkg/src/Makevars +++ b/Rpkg/src/Makevars @@ -27,6 +27,9 @@ endif PKG_CXXFLAGS = -g -O3 -I. -Wall -fPIC -std=c++0x -DBOOST_LOG_DYN_LINK PKG_CXXFLAGS += -I$(FG_DIR)/include -I$(FG_DIR)/libcommon -I$(FG_DIR)/flash-graph -I$(FG_DIR)/matrix PKG_CXXFLAGS += -I. -I$(RCPP_INCLUDE) $(OMP_FLAG) +ifdef ENABLE_TRILINOS + PKG_CXXFLAGS += -DENABLE_TRILINOS +endif ifdef FG_EIGEN PKG_CXXFLAGS += -DUSE_EIGEN endif