File tree Expand file tree Collapse file tree 3 files changed +28
-1
lines changed Expand file tree Collapse file tree 3 files changed +28
-1
lines changed Original file line number Diff line number Diff line change
1
+ 2023-01-24 Lukasz Laniewski-Wollk <
[email protected] >
2
+
3
+ * R/RcppLdpath.R: CxxFlags() now quotes only non-standard paths on linux
4
+
1
5
2023-01-08 Dirk Eddelbuettel <
[email protected] >
2
6
3
7
* inst/include/Rcpp/String.h: Address clang++-14 conversion warning
Original file line number Diff line number Diff line change @@ -20,6 +20,19 @@ Rcpp.system.file <- function(...){
20
20
tools :: file_path_as_absolute( base :: system.file( ... , package = " Rcpp" ) )
21
21
}
22
22
23
+ # # quote path if non-standard characters are used
24
+ Rcpp.quoteNonStandard <- function (path , quoteAll = .Platform $ OS.type != " unix" ) {
25
+ quoted <- shQuote(path )
26
+ if (quoteAll ) {
27
+ quoted
28
+ } else {
29
+ # Select paths in which all characters do not need quoting
30
+ sel <- grepl(" ^[[:alnum:]/._~+@%-]*$" , path )
31
+ # Quote remaining paths
32
+ ifelse(sel , path , quoted )
33
+ }
34
+ }
35
+
23
36
# # Use R's internal knowledge of path settings to find the lib/ directory
24
37
# # plus optinally an arch-specific directory on system building multi-arch
25
38
RcppLdPath <- function () {
@@ -51,7 +64,7 @@ RcppCxxFlags <- function(cxx0x=FALSE) {
51
64
if (.Platform $ OS.type == " windows" ) {
52
65
path <- asBuildPath(path ) # #nocov
53
66
}
54
- paste0(' -I" ' , path , ' " ' )
67
+ paste0(' -I' , Rcpp.quoteNonStandard( path ) )
55
68
}
56
69
57
70
# # Shorter names, and call cat() directly
Original file line number Diff line number Diff line change 3
3
\newcommand {\ghpr }{\href {https : // github.com / RcppCore / Rcpp / pull / # 1}{##1}}
4
4
\newcommand {\ghit }{\href {https : // github.com / RcppCore / Rcpp / issues / # 1}{##1}}
5
5
6
+ \section {Changes in Rcpp hotfix release version 1.0.11 (2023 - 07 - xx )}{
7
+ \itemize {
8
+ \item Changes in Rcpp API :
9
+ \itemize {
10
+ \item \code {Rcpp ::: CxxFlags()} now quotes only non - standard include path
11
+ on linux (closing \ghit {1242 }).
12
+ }
13
+ }
14
+ }
15
+
6
16
\section {Changes in Rcpp release version 1.0.10 (2023 - 01 - 12 )}{
7
17
\itemize {
8
18
\item Changes in Rcpp API :
You can’t perform that action at this time.
0 commit comments