Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Fix R-package/src/Makevars for OpenCV 4 #17404

Merged
merged 1 commit into from
Jan 23, 2020
Merged

Fix R-package/src/Makevars for OpenCV 4 #17404

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions R-package/src/Makevars
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CXX_STD = CXX11
PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) `pkg-config --libs opencv`
PKG_CFLAGS = `pkg-config --cflags opencv`
PKG_CPPFLAGS = -I../inst/include `pkg-config --cflags opencv` `Rscript -e 'Rcpp:::CxxFlags()'`
PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) `(pkg-config --libs opencv || pkg-config --libs opencv4)`
PKG_CFLAGS = `(pkg-config --cflags opencv || pkg-config --cflags opencv4)`
PKG_CPPFLAGS = -I../inst/include `(pkg-config --cflags opencv || pkg-config --cflags opencv4)` `Rscript -e 'Rcpp:::CxxFlags()'`