[caffe-contrib] 161/362: d/rules: custom-cpu target [passed]

[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 ef7777649f7cc4b54869ec86caf957ff45b49db8
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Wed Sep 2 02:01:52 2015 +0000

    d/rules: custom-cpu target [passed]
---
 debian/rules | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 1cb2e96..3231b42 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,8 +30,7 @@ CONFFLAG_CPU = \
 	-DBUILD_docs=OFF \
 	-DBUILD_python_layer=ON \
 	-DCMAKE_VERBOSE_MAKEFILE=ON \
-	-DCMAKE_INSTALL_PREFIX="/caffe_cpu" \
-	-DCMAKE_INSTALL_CONFIG_NAME="Release"
+	-DCMAKE_INSTALL_PREFIX="/caffe_cpu"
 CONFFLAG_CUDA = \
 	-DBLAS="Open" \
 	-DCMAKE_SKIP_RPATH=TRUE \
@@ -95,10 +94,12 @@ endif
 
 override_dh_auto_install:
 	dh_auto_install --builddirectory=${CAFFE_CPU_BUILDDIR} \
-		-- install
+		-- install \
+		CMAKE_COMMAND="/usr/bin/cmake -DCMAKE_INSTALL_CONFIG_NAME=\"Release\""
 ifeq (y, $(flag_build_caffe_cuda))
 	dh_auto_install --builddirectory=${CAFFE_CUDA_BUILDDIR} \
-		-- install
+		-- install \
+		CMAKE_COMMAND="/usr/bin/cmake -DCMAKE_INSTALL_CONFIG_NAME=\"Release\""
 endif
 
 get-orig-source:
@@ -129,8 +130,14 @@ custom-cpu:
 		-- runtest LD_LIBRARY_PATH=${CAFFE_CPU_BUILDDIR}/lib/ 
 	#cd ${CAFFE_CPU_BUILDDIR}; make $(CUSTOM_JOBS) runtest \
 	#		LD_LIBRARY_PATH=${CAFFE_CPU_BUILDDIR}/lib/
-	dh_auto_install --builddirectory=${CAFFE_CUDA_BUILDDIR} -- install
+	dh_auto_install --builddirectory=${CAFFE_CUDA_BUILDDIR} \
+		-- install CMAKE_COMMAND="/usr/bin/cmake -DCMAKE_INSTALL_CONFIG_NAME=\"Release\""
+	sed -i -e 's/CaffeTargets-none.cmake/CaffeTargets-release.cmake/g' \
+		debian/libcaffe-cpu-dev.install
+	cd ${CAFFE_CPU_BUILDDIR}; cmake -DCMAKE_INSTALL_CONFIG_NAME="Release" \
+		-P cmake_install.cmake
 	cd ${CAFFE_CPU_BUILDDIR}; make $(CUSTOM_JOBS) install
+	$(RM) debian/*.symbols
 	fakeroot dh binary \
 		--package=caffe-cpu \
 		--package=libcaffe-cpu0 \

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