From d6dbfc84db42d813747c4a4b038faa31a6b9503d Mon Sep 17 00:00:00 2001 From: Jeff Donahue Date: Tue, 14 Oct 2014 11:41:40 -0700 Subject: [PATCH] Revert "OpenCV should be compiled using pkg-config options." -- breaks compilation on working systems This reverts commit 4587b2f9043996fed36fc989c00329ec829ecae9. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c8226cb..35c37af 100644 --- a/Makefile +++ b/Makefile @@ -168,7 +168,8 @@ ifneq ($(CPU_ONLY), 1) LIBRARIES := cudart cublas curand endif LIBRARIES += glog gflags protobuf leveldb snappy \ - lmdb boost_system hdf5_hl hdf5 m + lmdb boost_system hdf5_hl hdf5 m \ + opencv_core opencv_highgui opencv_imgproc PYTHON_LIBRARIES := boost_python python2.7 WARNINGS := -Wall -Wno-sign-compare @@ -329,7 +330,6 @@ NVCCFLAGS += -ccbin=$(CXX) -Xcompiler -fPIC $(COMMON_FLAGS) MATLAB_CXXFLAGS := $(CXXFLAGS) -Wno-uninitialized LINKFLAGS += -pthread -fPIC $(COMMON_FLAGS) $(WARNINGS) LDFLAGS += $(foreach librarydir,$(LIBRARY_DIRS),-L$(librarydir)) \ - `pkg-config opencv --libs` \ $(foreach library,$(LIBRARIES),-l$(library)) PYTHON_LDFLAGS := $(LDFLAGS) $(foreach library,$(PYTHON_LIBRARIES),-l$(library)) -- 2.7.4