attempt fixing linux/macos installation error

agusinac · agusinac · commit 3c65e1fe6135 · 2026-08-03T14:56:04.000+02:00
diff --git a/NAMESPACE b/NAMESPACE
@@ -27,6 +27,8 @@ import(ggplot2)
 import(rhdf5)
 importFrom(Matrix,sparseMatrix)
 importFrom(Rcpp,sourceCpp)
+importFrom(RcppParallel,RcppParallelLibs)
+importFrom(RcppParallel,setThreadOptions)
 importFrom(ape,read.tree)
 importFrom(data.table,":=")
 importFrom(data.table,.SD)
diff --git a/R/OmicFlow-package.R b/R/OmicFlow-package.R
@@ -5,6 +5,8 @@
 #' @importFrom data.table := .SD
 #' @useDynLib OmicFlow, .registration = TRUE
 #' @importFrom Rcpp sourceCpp
+#' @importFrom RcppParallel RcppParallelLibs
+#' @importFrom RcppParallel setThreadOptions
 #' @importFrom utils globalVariables
 ## usethis namespace: end
 
diff --git a/man/OmicFlow-package.Rd b/man/OmicFlow-package.Rd
diff --git a/src/Makevars b/src/Makevars
@@ -1,2 +1 @@
-PKG_CXX11FLAGS = -O3
-PKG_LIBS = `${R_HOME}/bin/Rscript -e "RcppParallel::RcppParallelLibs()"` $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
+PKG_CXX11FLAGS = -O3
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,3 +1,2 @@
 PKG_CXX11FLAGS = -O3 -DRCPP_PARALLEL_USE_TBB=1 
-PKG_LIBS += $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" \
-              -e "RcppParallel::RcppParallelLibs()") $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
+PKG_LIBS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "RcppParallel::RcppParallelLibs()") $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-PKG_CXX11FLAGS = -O3`
`2`		-PKG_LIBS = `${R_HOME}/bin/Rscript -e "RcppParallel::RcppParallelLibs()"` $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
	`1`	`+PKG_CXX11FLAGS = -O3`