summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorYangqing Jia <jiayq84@gmail.com>2014-10-11 05:01:28 +0000
committerYangqing Jia <jiayq84@gmail.com>2014-10-11 05:01:28 +0000
commit0598fe93ac7bdc3f51c413c081283fdbc918c056 (patch)
treed385ad99eefbded4a9fc049a67548011112e3f58 /Makefile
parent44bc1552781eea958c228981a8638ddfcf80e3d9 (diff)
downloadcaffeonacl-0598fe93ac7bdc3f51c413c081283fdbc918c056.tar.gz
caffeonacl-0598fe93ac7bdc3f51c413c081283fdbc918c056.tar.bz2
caffeonacl-0598fe93ac7bdc3f51c413c081283fdbc918c056.zip
adding missing libraries - lm and lstdc++
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 5fb597c0..35c37af5 100644
--- a/Makefile
+++ b/Makefile
@@ -168,9 +168,7 @@ ifneq ($(CPU_ONLY), 1)
LIBRARIES := cudart cublas curand
endif
LIBRARIES += glog gflags protobuf leveldb snappy \
- lmdb \
- boost_system \
- hdf5_hl hdf5 \
+ lmdb boost_system hdf5_hl hdf5 m \
opencv_core opencv_highgui opencv_imgproc
PYTHON_LIBRARIES := boost_python python2.7
WARNINGS := -Wall -Wno-sign-compare
@@ -235,7 +233,8 @@ ifeq ($(LINUX), 1)
WARNINGS += -Wno-uninitialized
endif
# boost::thread is reasonably called boost_thread (compare OS X)
- LIBRARIES += boost_thread
+ # We will also explicitly add stdc++ to the link target.
+ LIBRARIES += boost_thread stdc++
endif
# OS X: