projects
/
platform
/
upstream
/
caffe.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
74a3788
)
include build/ before other dirs so old proto built files in src/ and
author
Jeff Donahue
<jeff.donahue@gmail.com>
Wed, 2 Apr 2014 18:29:01 +0000
(11:29 -0700)
committer
Jeff Donahue
<jeff.donahue@gmail.com>
Wed, 2 Apr 2014 18:29:01 +0000
(11:29 -0700)
include/ don't interfere
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
b9688d7
..
0947196
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-112,8
+112,8
@@
CUDA_LIB_DIR := $(CUDA_DIR)/lib64 $(CUDA_DIR)/lib
MKL_INCLUDE_DIR := $(MKL_DIR)/include
MKL_LIB_DIR := $(MKL_DIR)/lib $(MKL_DIR)/lib/intel64
-INCLUDE_DIRS += ./src ./include $(CUDA_INCLUDE_DIR)
INCLUDE_DIRS += $(BUILD_INCLUDE_DIR)
+INCLUDE_DIRS += ./src ./include $(CUDA_INCLUDE_DIR)
LIBRARY_DIRS += $(CUDA_LIB_DIR)
LIBRARIES := cudart cublas curand \
pthread \