Merge pull request BVLC#1332 from tleyden/master

[fix] set pthread last in build order
caiom · Oct 20, 2014 · 1cb0a14 · 1cb0a14
2 parents 51be352 + 686793e
commit 1cb0a14
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -165,12 +165,11 @@ ifneq ($(CPU_ONLY), 1)
 	LIBRARY_DIRS += $(CUDA_LIB_DIR)
 	LIBRARIES := cudart cublas curand
 endif
-LIBRARIES += pthread \
-	glog gflags protobuf leveldb snappy \
+LIBRARIES += glog gflags protobuf leveldb snappy \
 	lmdb \
 	boost_system \
 	hdf5_hl hdf5 \
-	opencv_core opencv_highgui opencv_imgproc
+	opencv_core opencv_highgui opencv_imgproc pthread
 PYTHON_LIBRARIES := boost_python python2.7
 WARNINGS := -Wall -Wno-sign-compare