summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorEvan Shelhamer <shelhamer@imaginarynumber.net>2014-02-18 11:10:23 -0800
committerEvan Shelhamer <shelhamer@imaginarynumber.net>2014-03-21 13:52:36 -0700
commitf6cbe2c5ce7b7acb32587c82a8f01f82bde24354 (patch)
tree215b7afa3fdd671e4603f702090e69cba6623188 /Makefile
parentc028d09ca6e923f38beea3ba0877f31ff784191f (diff)
downloadcaffe-f6cbe2c5ce7b7acb32587c82a8f01f82bde24354.tar.gz
caffe-f6cbe2c5ce7b7acb32587c82a8f01f82bde24354.tar.bz2
caffe-f6cbe2c5ce7b7acb32587c82a8f01f82bde24354.zip
make MKL switch surprise-proof
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 743a55f2..9f2e91cf 100644
--- a/Makefile
+++ b/Makefile
@@ -99,8 +99,9 @@ WARNINGS := -Wall
COMMON_FLAGS := -DNDEBUG -O2
-# MKL switch
-ifdef USE_MKL
+# MKL switch (default = non-MKL)
+USE_MKL ?= 0
+ifeq ($(USE_MKL), 1)
LIBRARIES += mkl_rt
COMMON_FLAGS += -DUSE_MKL
INCLUDE_DIRS += $(MKL_INCLUDE_DIR)