From 085fd79648cf69ae41d22911a9ab59bae470b914 Mon Sep 17 00:00:00 2001 From: Leonard Lausen Date: Wed, 22 Jan 2020 21:08:32 -0800 Subject: [PATCH] Fix R-package/src/Makevars for OpenCV 4 (#17404) --- R-package/src/Makevars | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/R-package/src/Makevars b/R-package/src/Makevars index 13df4d1db8eb..099471541b37 100644 --- a/R-package/src/Makevars +++ b/R-package/src/Makevars @@ -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()'`