Fix R-package/src/Makevars for OpenCV dependency

See apache#17282
leezu · Jan 13, 2020 · 46b2f1f · 46b2f1f
1 parent eb75b60
commit 46b2f1f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/R-package/src/Makevars b/R-package/src/Makevars
@@ -1,3 +1,4 @@
 CXX_STD = CXX11
-PKG_CPPFLAGS = -I../inst/include
-PKG_LIBS =  $(LAPACK_LIBS) $(BLAS_LIBS)
+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()'`
diff --git a/R-package/src/Makevars.win b/R-package/src/Makevars.win
@@ -1,3 +1,2 @@
-
 PKG_CPPFLAGS = -I../inst/include
 PKG_LIBS =  $(LAPACK_LIBS) $(BLAS_LIBS) -L../inst/libs/x64/ -llibmxnet