Skip to content

Commit 8d7885b

Browse files
eddelbuetteleddelbuettel
committed
release 0.3.2.0.3, updated DESCRIPTION and Makevars for Rcpp 0.11.0 or later
1 parent 441d4f9 commit 8d7885b

File tree

4 files changed

+26
-15
lines changed

4 files changed

+26
-15
lines changed

‎ChangeLog‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
2014-03-01 Dirk Eddelbuettel <edd@debian.org>
22

3+
* DESCRIPTION: New minor version 3.2.0.3
4+
5+
* DESCRIPTION: Switched to 'Imports: Rcpp (>= 0.11.0)'
6+
7+
* src/Makevars: Updated for Rcpp 0.11.0
8+
* src/Makevars.win: Ditto
9+
310
* R/RcppEigen.package.skeleton.R: Updated for Rcpp 0.11.0, also
411
updated for current R versions by removing deprecated 'namespace' arg
512

‎DESCRIPTION‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Package: RcppEigen
22
Type: Package
33
Title: Rcpp integration for the Eigen templated linear algebra library.
4-
Version: 0.3.2.0.2
5-
Date: 2014-01-26
4+
Version: 0.3.2.0.3
5+
Date: 2014-03-01
66
Author: Douglas Bates, Romain Francois and Dirk Eddelbuettel;
77
the authors of Eigen for the included version of Eigen
88
Maintainer: Dirk Eddelbuettel <edd@debian.org>
@@ -27,6 +27,6 @@ License: GPL (>= 2) | file LICENSE
2727
Depends: R (>= 2.15.1)
2828
LazyLoad: yes
2929
LinkingTo: Rcpp
30-
Imports: Matrix (>= 1.1-0), Rcpp (>= 0.10.5)
30+
Imports: Matrix (>= 1.1-0), Rcpp (>= 0.11.0)
3131
Suggests: inline, RUnit
3232
URL: http://eigen.tuxfamily.org

‎src/Makevars‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
## -*- mode: makefile; -*-
22

3-
PKG_CXXFLAGS=-I../inst/include
3+
PKG_CXXFLAGS = -I../inst/include
44

5-
PKG_LIBS=`$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"` $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
5+
## With Rcpp 0.11.0 and later, we no longer need to set PKG_LIBS for
6+
## Rcpp as there is no user-facing library.
7+
PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
8+
9+
## With R 3.1.0 or later, you can uncomment the following line to tell R to
10+
## enable compilation with C++11 (where available)
11+
#USE_CXX1X =

‎src/Makevars.win‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
## This assumes that we can call Rscript to ask Rcpp about its locations
2-
## Use the R_HOME indirection to support installations of multiple R version
3-
PKG_LIBS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()") $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
4-
5-
PKG_CPPFLAGS = -I../inst/include -I. -DNDEBUG
6-
7-
## For development use the package CXXFLAGS as
8-
#PKG_CXXFLAGS= -I../inst/include -I.
9-
## to activate assertions in Eigen. For the purposes of R CMD check the
10-
## assertions should be suppressed.
1+
## -*- mode: makefile; -*-
112

3+
PKG_CXXFLAGS = -I../inst/include
124

5+
## With Rcpp 0.11.0 and later, we no longer need to set PKG_LIBS for
6+
## Rcpp as there is no user-facing library.
7+
PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
138

9+
## With R 3.1.0 or later, you can uncomment the following line to tell R to
10+
## enable compilation with C++11 (where available)
11+
#USE_CXX1X =

0 commit comments

Comments
 (0)