[caffe-contrib] 166/362: d/rules: try to change CMAKE_CONFIGURATION_TYPES

Zhou Mo cdluminate-guest at moszumanska.debian.org
Tue May 3 09:24:27 UTC 2016


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 97fdeb448fb6bbbcbdc046beb4bb31369067ddad
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Wed Sep 2 03:03:21 2015 +0000

    d/rules: try to change CMAKE_CONFIGURATION_TYPES
---
 debian/rules | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index 7cf44ae..ab888a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,7 @@ CONFFLAG_CPU = \
 	-DBUILD_docs=OFF \
 	-DBUILD_python_layer=ON \
 	-DCMAKE_VERBOSE_MAKEFILE=ON \
+	-DCMAKE_CONFIGURATION_TYPES="Release" \
 	-DCMAKE_INSTALL_PREFIX="/caffe_cpu"
 CONFFLAG_CUDA = \
 	-DBLAS="Open" \
@@ -46,6 +47,7 @@ CONFFLAG_CUDA = \
 	-DCUDA_ARCH_NAME="All" \
 	-DCMAKE_CXX_COMPILER=g++-4.9 \
 	-DCMAKE_C_COMPILER=gcc-4.9 \
+	-DCMAKE_CONFIGURATION_TYPES="Release" \
 	-DCMAKE_INSTALL_PREFIX="/caffe_cuda"
 
 %:
@@ -92,13 +94,9 @@ ifeq (y, $(flag_build_caffe_cuda))
 endif
 
 override_dh_auto_install:
-	sed -i -e '1i\set(CMAKE_INSTALL_CONFIG_NAME "Release")' \
-		${CAFFE_CPU_BUILDDIR}/cmake_install.cmake
 	dh_auto_install --builddirectory=${CAFFE_CPU_BUILDDIR} \
 		-- install
 ifeq (y, $(flag_build_caffe_cuda))
-	sed -i -e '1i\set(CMAKE_INSTALL_CONFIG_NAME "Release")' \
-		${CAFFE_CUDA_BUILDDIR}/cmake_install.cmake
 	dh_auto_install --builddirectory=${CAFFE_CUDA_BUILDDIR} \
 		-- install
 endif

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



More information about the debian-science-commits mailing list