File tree Expand file tree Collapse file tree 3 files changed +5
-5
lines changed
Expand file tree Collapse file tree 3 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ RCPP_PARALLEL_CPPFLAGS=`"${R_HOME}/bin/Rscript" -e "cat(RcppParallel::CxxFlags()
55RCPP_PARALLEL_LIBS=` " ${R_HOME} /bin/Rscript" -e " cat(RcppParallel::LdFlags())" `
66
77# Generate sources.mk using R
8- " ${R_HOME} /bin/Rscript" R /generate_makevars_sources.R > src/sources.mk
8+ " ${R_HOME} /bin/Rscript" inst /generate_makevars_sources.R > src/sources.mk
99
1010# Substitute into Makevars
1111sed -e " s|@RCPP_PARALLEL_CPPFLAGS@|${RCPP_PARALLEL_CPPFLAGS} |" \
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ RCPP_PARALLEL_CPPFLAGS=`"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "cat(RcppPar
55RCPP_PARALLEL_LIBS=` " ${R_HOME} /bin${R_ARCH_BIN} /Rscript.exe" -e " cat(RcppParallel::LdFlags())" `
66
77# Generate sources.mk using R
8- " ${R_HOME} /bin/Rscript" R /generate_makevars_sources.R > src/sources.mk
8+ " ${R_HOME} /bin/Rscript" inst /generate_makevars_sources.R > src/sources.mk
99
1010# Substitute into Makevars.win
1111sed -e " s|@RCPP_PARALLEL_CPPFLAGS@|${RCPP_PARALLEL_CPPFLAGS} |" \
Original file line number Diff line number Diff line change @@ -5,10 +5,10 @@ cpp <- list.files(
55 full.names = TRUE
66)
77
8- # strip leading "src/"
9- cpp <- sub(" ^src/ " , " " , cpp )
8+ # strip leading "src/" (MacOs/ Linux) or leading "src\\" (Windows)
9+ cpp <- sub(" ^src[ \\\\ /] " , " " , cpp )
1010
11- con <- file(" src/ sources.mk" , open = " w" )
11+ con <- file(file.path( " src" , " sources.mk" ) , open = " w" )
1212
1313writeLines(c(
1414 " # ------------------------------------------------------------------" ,
You can’t perform that action at this time.
0 commit comments