Skip to content

quote path in CxxFlags #1189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
2021-11-14 Dirk Eddelbuettel <edd@debian.org>

* R/RcppLdpath.R: Simplified as we no longer need to worry about CXX0X

2021-11-11 Kevin Ushey <kevinushey@gmail.com>

* R/RcppLdpath.R: CxxFlags() now quotes its include path

2021-10-15 Travers Ching <traversc@gmail.com>

* inst/tinytest/testRcppAttributePackage: Tests `signature` attribute
Expand Down
5 changes: 2 additions & 3 deletions R/RcppLdpath.R
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,11 @@ canUseCXX0X <- function() { TRUE } # .Call( "canUseCXX0X", PACKAGE = "Rcpp" )

## Provide compiler flags -- i.e. -I/path/to/Rcpp.h
RcppCxxFlags <- function(cxx0x=FALSE) {
# path <- RcppLdPath()
path <- Rcpp.system.file( "include" )
if (.Platform$OS.type=="windows") {
path <- asBuildPath(path) # #nocov
}
paste("-I", path, if (cxx0x && canUseCXX0X()) " -std=c++0x" else "", sep="")
paste0('-I"', path, '"')
}

## Shorter names, and call cat() directly
Expand Down Expand Up @@ -82,5 +81,5 @@ RcppCxx0xFlags <- function() {
}

Cxx0xFlags <- function() {
cat( RcppCxx0xFlags() ) # #nocov end
cat(RcppCxx0xFlags()) # #nocov end
}
2 changes: 2 additions & 0 deletions inst/NEWS.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
extensive discussion in \ghit{1158}.
\item A new \code{#define} allows default setting of finalizer
calls for external pointers (Iñaki in \ghpr{1180} closing \ghit{1108}).
\item `Rcpp:::CxxFlags()` now quotes the include path generated,
closing \ghit{1188}.
}
\item Changes in Rcpp Documentation:
\itemize{
Expand Down