[caffe-contrib] 299/362: rules: refresh CONFFLAG

[Zhou Mo]

This is an automated email from the git hooks/post-receive script.

cdluminate-guest pushed a commit to branch master
in repository caffe-contrib.

commit 166eb0472e54d332f6550d9e13379405f1e33da7
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Wed Mar 9 08:55:10 2016 +0000

    rules: refresh CONFFLAG
---
 debian/rules | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index 0d810b9..4bc8d7d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,10 +22,11 @@ ifeq (installed, $(shell dpkg -s nvidia-cuda-toolkit | grep -o installed))
 	flag_build_caffe_cuda := y
 endif
 
-## CMake Configuration Template, note $(FIXME) does not contain value!
+## CMake Configuration Template.
 ## Include template and override the fixme options in later configs.
 ## * specifying compiler version because of NVCC.
 CMAKE_CONFIGURE_TEMPLATE = \
+	-DALLOW_LMDB_NOLOCK=OFF \
 	-DBLAS="Open" \
 	-DBUILD_SHARED_LIBS=ON \
 	-DBUILD_docs=OFF \
@@ -34,17 +35,17 @@ CMAKE_CONFIGURE_TEMPLATE = \
 	-DBUILD_python_layer=ON \
 	-Dpython_version="2" \
 	-DCMAKE_BUILD_TYPE="Release" \
-	-DCMAKE_CXX_COMPILER=$(FIXME) \
-	-DCMAKE_C_COMPILER=$(FIXME) \
-	-DCMAKE_INSTALL_PREFIX=$(FIXME) \
 	-DCMAKE_SKIP_RPATH=TRUE \
 	-DCMAKE_VERBOSE_MAKEFILE=OFF \
-	-DCPU_ONLY=$(FIXME) \
-	-DCUDA_ARCH_NAME="All" \
 	-DUSE_CUDNN=OFF \
 	-DUSE_LEVELDB=ON \
 	-DUSE_LMDB=ON \
-	-DUSE_OPENCV=ON
+	-DUSE_OPENCV=ON \
+	-DCMAKE_CXX_COMPILER= \
+	-DCMAKE_C_COMPILER= \
+	-DCMAKE_INSTALL_PREFIX= \
+	-DCPU_ONLY= \
+	-DCUDA_ARCH_NAME="All"
 CONFFLAG_CPU = $(CMAKE_CONFIGURE_TEMPLATE) \
 	-DCMAKE_CXX_COMPILER=g++ \
 	-DCMAKE_C_COMPILER=gcc \
@@ -175,7 +176,7 @@ CONFFLAG_CPU_CUSTOM = $(CMAKE_CONFIGURE_TEMPLATE) \
 	-DCMAKE_CXX_COMPILER=g++ \
 	-DCMAKE_C_COMPILER=gcc \
 	-DCMAKE_INSTALL_PREFIX="/caffe_cpu" \
-	-DCPU_ONLY=ON \
+	-DCPU_ONLY=ON
 CONFFLAG_CUDA_CUSTOM = $(CMAKE_CONFIGURE_TEMPLATE) \
 	-DCMAKE_CXX_COMPILER=g++-5 \
 	-DCMAKE_C_COMPILER=gcc-5 \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/caffe-contrib.git