Merge pull request #1189 from RcppCore/feature/cxx-flags-quote

quote path in CxxFlags

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,11 @@
+2021-11-14  Dirk Eddelbuettel  <[email protected]>
+
+	* R/RcppLdpath.R: Simplified as we no longer need to worry about CXX0X
+
+2021-11-11  Kevin Ushey  <[email protected]>
+
+	* R/RcppLdpath.R: CxxFlags() now quotes its include path
+
 2021-10-15  Travers Ching  <[email protected]>
 
 	* inst/tinytest/testRcppAttributePackage: Tests `signature` attribute

R/RcppLdpath.R

@@ -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
@@ -82,5 +81,5 @@ RcppCxx0xFlags <- function() {
 }
 
 Cxx0xFlags <- function() {
-    cat( RcppCxx0xFlags() )									# #nocov end
+    cat(RcppCxx0xFlags())									# #nocov end
 }

inst/NEWS.Rd

@@ -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{