Merge pull request #4896 from tiagoshibata/opencv4-AlexeyAB

Support building with OpenCV 4
5 years ago · 1de03f948c
parent a67a3d7880 187918f564
commit 1de03f948c
1 changed files with 3 additions and 3 deletions
--- a/6
+++ b/6
@ -60,7 +60,7 @@ else
 CC=gcc
 endif

-CPP=g++
+CPP=g++ -std=c++11
 NVCC=nvcc
 OPTS=-Ofast
 LDFLAGS= -lm -pthread
@ -87,8 +87,8 @@ endif
 ifeq ($(OPENCV), 1)
 COMMON+= -DOPENCV
 CFLAGS+= -DOPENCV
-LDFLAGS+= `pkg-config --libs opencv`
-COMMON+= `pkg-config --cflags opencv`
+LDFLAGS+= `pkg-config --libs opencv4 2> /dev/null || pkg-config --libs opencv`
+COMMON+= `pkg-config --cflags opencv4 2> /dev/null || pkg-config --cflags opencv`
 endif

 ifeq ($(OPENMP), 1)