diff options
| author | Yangqing Jia <jiayq84@gmail.com> | 2013-11-11 17:08:27 -0800 |
|---|---|---|
| committer | Yangqing Jia <jiayq84@gmail.com> | 2013-11-11 17:08:27 -0800 |
| commit | 652d744360fb317a41e0456c0d1226262c5a70d4 (patch) | |
| tree | d74f78a0ec4917d51a8674804f0535d625f57901 /Makefile | |
| parent | 76bf486e3de96fe6f5619693742e5c1bb19074b2 (diff) | |
| parent | c8e7cce7316c29b32d0b2dcdc98bff75afa0ab40 (diff) | |
| download | caffeonacl-652d744360fb317a41e0456c0d1226262c5a70d4.tar.gz caffeonacl-652d744360fb317a41e0456c0d1226262c5a70d4.tar.bz2 caffeonacl-652d744360fb317a41e0456c0d1226262c5a70d4.zip | |
Merge branch 'master' of github.com:Yangqing/caffe
Conflicts:
Makefile
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -45,7 +45,8 @@ INCLUDE_DIRS := ./src ./include /usr/local/include $(CUDA_INCLUDE_DIR) \ $(MKL_INCLUDE_DIR) LIBRARY_DIRS := /usr/lib /usr/local/lib $(CUDA_LIB_DIR) $(MKL_LIB_DIR) LIBRARIES := cuda cudart cublas curand protobuf opencv_core opencv_highgui \ - glog mkl_rt mkl_intel_thread leveldb snappy pthread boost_system + glog mkl_rt mkl_intel_thread leveldb snappy pthread boost_system \ + opencv_imgproc WARNINGS := -Wall COMMON_FLAGS := -DNDEBUG $(foreach includedir,$(INCLUDE_DIRS),-I$(includedir)) |