Skip to content

Commit

Permalink
[build] include IO dependencies by default
Browse files Browse the repository at this point in the history
keep old behavior by including leveldb, lmdb, and opencv by default
  • Loading branch information
shelhamer committed Sep 17, 2015
1 parent 2a585f7 commit e75ae96
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,11 @@ endif

LIBRARIES += glog gflags protobuf boost_system m hdf5_hl hdf5

# handle IO dependencies
USE_LEVELDB ?= 1
USE_LMDB ?= 1
USE_OPENCV ?= 1

ifeq ($(USE_LEVELDB), 1)
LIBRARIES += leveldb snappy
endif
Expand Down Expand Up @@ -299,7 +304,7 @@ ifeq ($(USE_CUDNN), 1)
COMMON_FLAGS += -DUSE_CUDNN
endif

# i/o libraries configuration
# configure IO libraries
ifeq ($(USE_OPENCV), 1)
COMMON_FLAGS += -DUSE_OPENCV
endif
Expand Down
8 changes: 4 additions & 4 deletions Makefile.config.example
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
# CPU-only switch (uncomment to build without GPU support).
# CPU_ONLY := 1

# comment out to disable IO dependencies
USE_LEVELDB := 1
USE_LMDB := 1
USE_OPENCV := 1
# uncomment to disable IO dependencies and corresponding data layers
# USE_LEVELDB := 0
# USE_LMDB := 0
# USE_OPENCV := 0

# To customize your choice of compiler, uncomment and set the following.
# N.B. the default for Linux is g++ and the default for OSX is clang++
Expand Down

0 comments on commit e75ae96

Please sign in to comment.