diff options
| author | Ken Kellner <kenkellner@users.noreply.github.com> | 2023-07-25 08:59:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-25 08:59:30 -0400 |
| commit | 4465084c53606880a43618878ae005a90818ead5 (patch) | |
| tree | e39e9a8bc144bc4a3b93a4357916d609cd15c2d3 | |
| parent | 96007981cd8ed3650aa134f446653074645ec866 (diff) | |
| parent | fbb8bc2d5fcb1145546814380fe599cf3cde5bba (diff) | |
Merge pull request #70 from jgabry/patch-1
Fix Makevars to avoid CRAN warning
| -rw-r--r-- | src/Makevars | 2 | ||||
| -rw-r--r-- | src/Makevars.win | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Makevars b/src/Makevars index 7b9c5ab..8a84418 100644 --- a/src/Makevars +++ b/src/Makevars @@ -1,6 +1,6 @@ STANHEADERS_SRC = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "message()" -e "cat(system.file('include', 'src', package = 'StanHeaders', mustWork = TRUE))" -e "message()" | grep "StanHeaders") -STANC_FLAGS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "cat(ifelse(utils::packageVersion('rstan') >= 2.26, '-DUSE_STANC3',''))") +STANC_FLAGS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "cat(ifelse(utils::packageVersion('rstan') >= '2.26', '-DUSE_STANC3',''))") # COMMENT THIS OUT WHEN TESTING CLANG PKG_CPPFLAGS = -I"../inst/include" -I"$(STANHEADERS_SRC)" -DBOOST_DISABLE_ASSERTS -DEIGEN_NO_DEBUG -DBOOST_MATH_OVERFLOW_ERROR_POLICY=errno_on_error $(STANC_FLAGS) -D_HAS_AUTO_PTR_ETC=0 diff --git a/src/Makevars.win b/src/Makevars.win index 23dfbd7..e9205c8 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -1,6 +1,6 @@ STANHEADERS_SRC = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "message()" -e "cat(system.file('include', 'src', package = 'StanHeaders', mustWork = TRUE))" -e "message()" | grep "StanHeaders") -STANC_FLAGS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "cat(ifelse(utils::packageVersion('rstan') >= 2.26, '-DUSE_STANC3',''))") +STANC_FLAGS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "cat(ifelse(utils::packageVersion('rstan') >= '2.26', '-DUSE_STANC3',''))") PKG_CPPFLAGS = -I"../inst/include" -I"$(STANHEADERS_SRC)" -DBOOST_DISABLE_ASSERTS -DEIGEN_NO_DEBUG -DRCPP_PARALLEL_USE_TBB=1 $(STANC_FLAGS) -D_HAS_AUTO_PTR_ETC=0 PKG_CXXFLAGS = $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "RcppParallel::CxxFlags()") $(shell "$(R_HOME)/bin$(R_ARCH_BIN)/Rscript" -e "StanHeaders:::CxxFlags()") |