[caffe-contrib] 65/362: rules: fix soname of 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 62ac464ddd15d13611ec328b787251c1904d4b5f
Author: Zhou Mo <cdluminate at gmail.com>
Date:   Fri Aug 7 13:26:15 2015 +0000

    rules: fix soname of cmake
---
 ...fix-cmake-add-target-property-version-soversion.patch | 16 ++++++++++++++--
 debian/rules                                             |  4 +---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/debian/patches/fix-cmake-add-target-property-version-soversion.patch b/debian/patches/fix-cmake-add-target-property-version-soversion.patch
index f3d3f95..afe0604 100644
--- a/debian/patches/fix-cmake-add-target-property-version-soversion.patch
+++ b/debian/patches/fix-cmake-add-target-property-version-soversion.patch
@@ -6,9 +6,21 @@
      LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib"
 -    RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
 +    RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin"
-+    VERSION "${DEBIAN_TARGET_VERSION}"
-+    SOVERSION "${DEBIAN_TARGET_SOVERSION}"
++    VERSION ${DEBIAN_TARGET_VERSION}
++    SOVERSION ${DEBIAN_TARGET_SOVERSION}
 +	)
    # make sure we build all external depepdencies first
    if (DEFINED external_project_dependencies)
      add_dependencies(${target} ${external_project_dependencies})
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,6 +3,9 @@
+ # ---[ Caffe project
+ project(Caffe C CXX)
+ 
++set(DEBIAN_TARGET_VERSION "0")
++set(DEBIAN_TARGET_SOVERSION "0")
++
+ # ---[ Using cmake scripts and modules
+ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
+ 
diff --git a/debian/rules b/debian/rules
index 09453d1..bc134ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,8 +7,6 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 RULES  := debian/rules
 export CAFFE_CPU_BUILDDIR="caffe_cpu_build"
 #export CAFFE_CUDA_BUILDDIR="caffe_cuda_build"
-export DEBIAN_TARGET_VERSION="0" \
-export DEBIAN_TARGET_SOVERSION="0" 
 
 %:
 	dh $@ --parallel \
@@ -25,7 +23,7 @@ override_dh_auto_configure:
 		-Dpython_version="2" \
 		-DBUILD_matlab=OFF \
 		-DBUILD_docs=ON \
-		-DBUILD_python_layer=ON \
+		-DBUILD_python_layer=ON
 
 override_dh_auto_clean:
 	dh_testdir

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