[caffe-contrib] 66/362: rules: migrate some cmake patchs into rules

[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 cbcd209d2f0d1de4b873c333e81e46b532018b8d
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Fri Aug 7 14:01:07 2015 +0000

    rules: migrate some cmake patchs into rules
---
 debian/patches/series | 8 ++++----
 debian/rules          | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 6e24dd4..851b862 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,7 @@ fix-cmake-add-target-property-version-soversion.patch
 00-fix-include-path-for-debian.patch
 01-fix-makefile-rpath-and-soname.patch
 02-empty-the-gitignore
-03-set-cmake-deps-openblas.patch
-04-fix-rpath-issue-in-cmake.patch
-# 05-set-cmake-cpuonly.patch # cmake is used to build the caffe-cuda
-06-cmake-add-soname.patch
+#03-set-cmake-deps-openblas.patch
+#04-fix-rpath-issue-in-cmake.patch
+#05-set-cmake-cpuonly.patch # cmake is used to build the caffe-cuda
+#06-cmake-add-soname.patch
diff --git a/debian/rules b/debian/rules
index bc134ac..6684b50 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,8 @@ export CAFFE_CPU_BUILDDIR="caffe_cpu_build"
 override_dh_auto_configure:
 	# This configure is for CPU only caffe
 	dh_auto_configure -- \
+		-DBLAS="Open"
+		-DCMAKE_SKIP_RPATH=TRUE \
 		-DCPU_ONLY=ON \
 		-DUSE_CUDNN=OFF \
 		-DBUILD_SHARED_LIBS=ON \

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