Skip to content

Commit 2676e02

Browse files
committed
More restrictive matching of c++ file extensions for compileAttributes
1 parent 89b0275 commit 2676e02

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-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-18 JJ Allaiare <jj@rstudio.org>
2+
3+
* R/Attributes.R: More restrictive matching of c++ file extensions
4+
for compileAttributes.
5+
16
2014-01-17 Dirk Eddelbuettel <edd@debian.org>
27

38
* R/RcppLdpath.R (RcppCxxFlags): Restore function to supply values

R/Attributes.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ compileAttributes <- function(pkgdir = ".", verbose = getOption("verbose")) {
352352
dir.create(rDir)
353353

354354
# get a list of all source files
355-
cppFiles <- list.files(srcDir, pattern=glob2rx("*.c*"))
355+
cppFiles <- list.files(srcDir, pattern="\\.c(c|pp)$")
356356

357357
# derive base names (will be used for modules)
358358
cppFileBasenames <- tools::file_path_sans_ext(cppFiles)

0 commit comments

Comments
 (0)