Skip to content

Commit 89b0275

Browse files
committed
restore ability to supply include information via -I to client packages
1 parent b138780 commit 89b0275

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2014-01-17 Dirk Eddelbuettel <edd@debian.org>
2+
3+
* R/RcppLdpath.R (RcppCxxFlags): Restore function to supply values
4+
for include files for packages not yet converted to LinkingTo:
5+
16
2014-01-16 JJ Allaiare <jj@rstudio.org>
27

38
* inst/include/Rcpp/macros/macros.h: Use Rf_onintr rather than

R/RcppLdpath.R

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,12 @@ canUseCXX0X <- function() .Call( "canUseCXX0X", PACKAGE = "Rcpp" )
4141

4242
## Provide compiler flags -- i.e. -I/path/to/Rcpp.h
4343
RcppCxxFlags <- function(cxx0x=FALSE) {
44-
""
44+
# path <- RcppLdPath()
45+
path <- Rcpp.system.file( "include" )
46+
if (.Platform$OS.type=="windows") {
47+
path <- asBuildPath(path)
48+
}
49+
paste("-I", path, if (cxx0x && canUseCXX0X()) " -std=c++0x" else "", sep="")
4550
}
4651

4752
## Shorter names, and call cat() directly

0 commit comments

Comments
 (0)