diff options
| author | Ronghang Hu <huronghang@hotmail.com> | 2015-10-22 15:17:26 -0700 |
|---|---|---|
| committer | Ronghang Hu <huronghang@hotmail.com> | 2015-10-22 15:17:26 -0700 |
| commit | 50a23b7ba2c8fe9ee2f6e115bdc5948ff82c194d (patch) | |
| tree | de74d062ea5e59db2df7b8a6901941e122f21e95 /Makefile | |
| parent | 9306302ae4f3c0fba812bbd3468881f99b59e04b (diff) | |
| parent | 3e5f49435f95de57bffbde53d745dcb4a8f1f870 (diff) | |
| download | caffe-50a23b7ba2c8fe9ee2f6e115bdc5948ff82c194d.tar.gz caffe-50a23b7ba2c8fe9ee2f6e115bdc5948ff82c194d.tar.bz2 caffe-50a23b7ba2c8fe9ee2f6e115bdc5948ff82c194d.zip | |
Merge pull request #3186 from lionleaf/makefile_opencv_imgcodecs
Add opencv_imgcodecs to library path in Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -184,7 +184,12 @@ ifeq ($(USE_LMDB), 1) LIBRARIES += lmdb endif ifeq ($(USE_OPENCV), 1) - LIBRARIES += opencv_core opencv_highgui opencv_imgproc + LIBRARIES += opencv_core opencv_highgui opencv_imgproc + + ifeq ($(OPENCV_VERSION), 3) + LIBRARIES += opencv_imgcodecs + endif + endif PYTHON_LIBRARIES := boost_python python2.7 WARNINGS := -Wall -Wno-sign-compare |