diff options
| author | Andreas Løve Selvik <andreas.l.selvik@gmail.com> | 2015-10-13 16:32:52 +0200 |
|---|---|---|
| committer | Andreas Løve Selvik <andreas.l.selvik@gmail.com> | 2015-10-22 22:24:29 +0200 |
| commit | 3e5f49435f95de57bffbde53d745dcb4a8f1f870 (patch) | |
| tree | 566aeea532067a81cbb517fa85edc2fcef1dc250 /Makefile | |
| parent | 0151742509c23b927b0159230ac70399ac4f8967 (diff) | |
| download | caffeonacl-3e5f49435f95de57bffbde53d745dcb4a8f1f870.tar.gz caffeonacl-3e5f49435f95de57bffbde53d745dcb4a8f1f870.tar.bz2 caffeonacl-3e5f49435f95de57bffbde53d745dcb4a8f1f870.zip | |
Add opencv_imgcodecs to library path in Makefile
Project does not compile without opencv_imgcodecs in the library path if
you're using OpenCV 3.
This introduces a OPENCV_VERSION flag in Makefile.config that includes
the library if set to 3. (Trying to include it with OpenCV 2 also
breaks the build)
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 |