[caffe-contrib] 64/362: rules: migrating to cmake

[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 d1f0fefd4d0ecf8fda4e5eafb23cd0a13bfe4889
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Fri Aug 7 12:08:04 2015 +0000

    rules: migrating to cmake
---
 debian/rules | 32 +++++++-------------------------
 1 file changed, 7 insertions(+), 25 deletions(-)

diff --git a/debian/rules b/debian/rules
index 75cda4e..09453d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,17 +5,15 @@ export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 RULES  := debian/rules
-#CONFIG := debian/config/Makefile.config
+export CAFFE_CPU_BUILDDIR="caffe_cpu_build"
+#export CAFFE_CUDA_BUILDDIR="caffe_cuda_build"
 export DEBIAN_TARGET_VERSION="0" \
 export DEBIAN_TARGET_SOVERSION="0" 
 
-
-# TODO: bump build system from Make to Cmake
-
 %:
 	dh $@ --parallel \
 	      --buildsystem=cmake \
-		  --builddirectory=caffe_cpu_build
+		  --builddirectory=${CAFFE_CPU_BUILDDIR}
 
 override_dh_auto_configure:
 	# This configure is for CPU only caffe
@@ -28,33 +26,17 @@ override_dh_auto_configure:
 		-DBUILD_matlab=OFF \
 		-DBUILD_docs=ON \
 		-DBUILD_python_layer=ON \
-	# this part if for the Make build system.   
-# The Makefile of upstream checks the file  
-# Makefile.config before every action,      
-# even the 'clean'                          
-#.PHONY: config rmconfig                     
-#config:                                     
-#	cp $(CONFIG) ./                         
-#rmconfig:                                   
-#	-rm Makefile.config                     
-
-#override_dh_auto_clean: config
-#	# we need a config file before `make clean`
-#	dh_auto_clean
-#	# debhelper will complain if there is a Makefile.config which
-#	# is considered "dirty", so delete it
-#	$(RULES) rmconfig
 
-#override_dh_auto_build: config
-#	dh_auto_build -- all pycaffe distribute
-#	$(RULES) rmconfig
+override_dh_auto_clean:
+	dh_testdir
+	-$(RM) -rf ${CAFFE_CPU_BUILDDIR}
 
 # In the test phase, we need to set LD_LIBRARY_PATH properly
 # for those test ELFs linked with libcaffe.so.X
 #override_dh_auto_test: config
 override_dh_auto_test: 
 	dh_auto_test -- test # compile test excutables 
-	dh_auto_test -- runtest LD_LIBRARY_PATH=obj-x86_64-linux-gnu/lib/ 
+	dh_auto_test -- runtest LD_LIBRARY_PATH=${CAFFE_CPU_BUILDDIR}/lib/ 
 
 # Since the Distributed Binary Caffe can not play the best performance
 # of user's machines, it's good to provide a custom build target,

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