Opt into 'current' Armadillo (#69)

eddelbuettel · coatless · web-flow · commit 20675ef82c11 · 2025-09-08T15:37:08.000-05:00
* Opt into 'current' Armadillo

* Update LinkingTo version for RcppArmadillo

---------

Co-authored-by: James J Balamuta &lt;coatless@users.noreply.github.com&gt;
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -28,7 +28,7 @@ License: GPL (>= 2)
 URL: https://github.com/coatless-rpkg/rcppensmallen, https://r-pkg.thecoatlessprofessor.com/rcppensmallen/, https://github.com/mlpack/ensmallen, https://ensmallen.org/
 BugReports: https://github.com/coatless-rpkg/rcppensmallen/issues
 Encoding: UTF-8
-LinkingTo: Rcpp, RcppArmadillo (>= 0.10.8.2.0)
+LinkingTo: Rcpp, RcppArmadillo (>= 15.0.2-1)
 Imports: Rcpp
 RoxygenNote: 7.3.2
 Roxygen: list(markdown = TRUE)
diff --git a/src/Makevars b/src/Makevars
@@ -1,2 +1,2 @@
-PKG_CXXFLAGS = -I../inst/include $(SHLIB_OPENMP_CXXFLAGS)
+PKG_CXXFLAGS = -I../inst/include $(SHLIB_OPENMP_CXXFLAGS) -DARMA_USE_CURRENT
 PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,2 +1,2 @@
-PKG_CXXFLAGS = -I../inst/include -I. $(SHLIB_OPENMP_CXXFLAGS)
+PKG_CXXFLAGS = -I../inst/include -I. $(SHLIB_OPENMP_CXXFLAGS) -DARMA_USE_CURRENT
 PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-PKG_CXXFLAGS = -I../inst/include $(SHLIB_OPENMP_CXXFLAGS)`
	`1`	`+PKG_CXXFLAGS = -I../inst/include $(SHLIB_OPENMP_CXXFLAGS) -DARMA_USE_CURRENT`
`2`	`2`	`PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-PKG_CXXFLAGS = -I../inst/include -I. $(SHLIB_OPENMP_CXXFLAGS)`
	`1`	`+PKG_CXXFLAGS = -I../inst/include -I. $(SHLIB_OPENMP_CXXFLAGS) -DARMA_USE_CURRENT`
`2`	`2`	`PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)`