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:
fb0a3d0
)
add <cuda>/lib64 only if exists to suppress linker warnings
author
Jeff Donahue
<jeff.donahue@gmail.com>
Sun, 7 Sep 2014 09:47:31 +0000
(11:47 +0200)
committer
Jeff Donahue
<jeff.donahue@gmail.com>
Sun, 7 Sep 2014 09:50:58 +0000
(11:50 +0200)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
546de93
..
525e7e9
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-151,7
+151,13
@@
NONEMPTY_WARN_REPORT := $(BUILD_DIR)/$(WARNS_EXT)
# Derive include and lib directories
##############################
CUDA_INCLUDE_DIR := $(CUDA_DIR)/include
-CUDA_LIB_DIR := $(CUDA_DIR)/lib64 $(CUDA_DIR)/lib
+
+CUDA_LIB_DIR :=
+# add <cuda>/lib64 only if it exists
+ifneq ("$(wildcard $(CUDA_DIR)/lib64)","")
+ CUDA_LIB_DIR += $(CUDA_DIR)/lib64
+endif
+CUDA_LIB_DIR += $(CUDA_DIR)/lib
INCLUDE_DIRS += $(BUILD_INCLUDE_DIR) ./src ./include
ifneq ($(CPU_ONLY), 1)