Fix compilation issue with OpenMP and RcppArmadillo

swarm-lab · Aug 1, 2024 · 4fdac85 · 4fdac85
1 parent 64efea5
commit 4fdac85
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Makevars b/src/Makevars
@@ -1,3 +1,3 @@
-PKG_LIBS = `$(R_HOME)/bin/Rscript -e 'ROpenCVLite::opencvConfig("libs")'`
-PKG_CPPFLAGS = `$(R_HOME)/bin/Rscript -e 'ROpenCVLite::opencvConfig("cflags")'`
+PKG_LIBS = `$(R_HOME)/bin/Rscript -e 'ROpenCVLite::opencvConfig("libs")'` $(SHLIB_OPENMP_CXXFLAGS)
+PKG_CPPFLAGS = `$(R_HOME)/bin/Rscript -e 'ROpenCVLite::opencvConfig("cflags")'` -g -O3 $(SHLIB_OPENMP_CXXFLAGS)
 PKG_CXXFLAGS = `$(R_HOME)/bin/Rscript -e 'Rcpp:::CxxFlags()'` -g -O3 $(SHLIB_OPENMP_CXXFLAGS)
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,5 +1,5 @@
 PKG_LIBS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e \
-						"ROpenCVLite::opencvConfig('libs', arch = Sys.getenv('R_ARCH'))")
+						"ROpenCVLite::opencvConfig('libs', arch = Sys.getenv('R_ARCH'))") $(SHLIB_OPENMP_CXXFLAGS)
 PKG_CPPFLAGS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e \
-						"ROpenCVLite::opencvConfig('cflags', arch = Sys.getenv('R_ARCH'))")
+						"ROpenCVLite::opencvConfig('cflags', arch = Sys.getenv('R_ARCH'))") -g -O3 $(SHLIB_OPENMP_CXXFLAGS)
 PKG_CXXFLAGS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::CxxFlags()") -g -O3 $(SHLIB_OPENMP_CXXFLAGS)