[ismrmrd] 09/12: d/patches: add soversioning of utility lib

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository ismrmrd.

commit f4817349140ba37d2ffa64a6eecf87c54082c7ae
Author: Ghislain Vaillant <ghisvail at gmail.com>
Date:   Mon Apr 28 23:47:40 2014 +0100

    d/patches: add soversioning of utility lib
---
 debian/patches/002-add-soversion.diff | 55 ++++++++++++++++++++++++++---------
 1 file changed, 41 insertions(+), 14 deletions(-)

diff --git a/debian/patches/002-add-soversion.diff b/debian/patches/002-add-soversion.diff
index 64e36a1..9d8b8ed 100644
--- a/debian/patches/002-add-soversion.diff
+++ b/debian/patches/002-add-soversion.diff
@@ -1,26 +1,53 @@
 From: Ghislain Vaillant <ghisvail at gmail.com>
 Subject: Add required soversioning
  Upstream does not use soversioning, which is not compliant with the Debian 
- policy. This patch introduces a temporary soversion, whilst the necessary 
- modifications are discussed upstream.
+ policy. This patch introduces a temporary soversion string.
 Forwarded: yes
 Bug: http://sourceforge.net/p/ismrmrd/tickets/11/
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -36,6 +38,16 @@
+@@ -3,6 +3,19 @@
+ 
+ enable_testing()
+ 
++SET(ISMRMRD_MAJOR_VERSION 0)
++SET(ISMRMRD_MINOR_VERSION 5)
++SET(ISMRMRD_BUILD_VERSION 0)
++SET(ISMRMRD_VERSION
++  "${ISMRMRD_MAJOR_VERSION}.${ISMRMRD_MINOR_VERSION}.${ISMRMRD_BUILD_VERSION}")
++SET(ISMRMRD_SOVERSION
++  "${ISMRMRD_MAJOR_VERSION}")
++SET(ISMRMRD_LIBRARY_PROPERTIES ${ISMRMRD_LIBRARY_PROPERTIES}
++  VERSION "${ISMRMRD_VERSION}"
++  SOVERSION "${ISMRMRD_SOVERSION}"
++)
++SET(ISMRMRD_UTILITY_PROPERTIES ${ISMRMRD_LIBRARY_PROPERTIES})
++
+ if (WIN32)
+ ADD_DEFINITIONS(-DWIN32 -D_WIN32 -D_WINDOWS)
+ ADD_DEFINITIONS(-DUNICODE -D_UNICODE)
+@@ -35,6 +48,7 @@
+ 
  # Add library ismrmrd
  add_library(ismrmrd SHARED ismrmrd_hdf5.cpp)
++SET_TARGET_PROPERTIES(ismrmrd PROPERTIES ${ISMRMRD_LIBRARY_PROPERTIES})
  
-+# Add version string info
-+set(ISMRMRD_VERSION_MAJOR 0)
-+set(ISMRMRD_VERSION_MINOR 5)
-+set(ISMRMRD_VERSION_PATCH 0)
-+set(ISMRMRD_VERSION_STRING
-+	${ISMRMRD_VERSION_MAJOR}.${ISMRMRD_VERSION_MINOR}.${ISMRMRD_VERSION_PATCH})
-+set_target_properties(ismrmrd PROPERTIES
-+	VERSION ${ISMRMRD_VERSION_STRING}
-+	SOVERSION ${ISMRMRD_VERSION_MAJOR})
-+
  #The findHDF5.cmake does not work very well on Windows, let's help it out
  IF(WIN32)
- 	SET(HDF5_LIB_DIR ${HDF5_INCLUDE_DIR}/../lib)
+--- a/utilities/CMakeLists.txt
++++ b/utilities/CMakeLists.txt
+@@ -5,6 +5,7 @@
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/..  ${Boost_INCLUDE_DIR})
+ 
+ ADD_LIBRARY(ismrmrd_utilities SHARED ismrmrd_phantom.cpp)
++SET_TARGET_PROPERTIES(ismrmrd_utilities PROPERTIES ${ISMRMRD_UTILITY_PROPERTIES})
+ INSTALL(TARGETS ismrmrd_utilities DESTINATION lib)
+ 
+ IF(FFTW3_FOUND)
+@@ -16,4 +17,4 @@
+ 	TARGET_LINK_LIBRARIES(ismrmrd_generate_cartesian_shepp_logan ismrmrd_utilities ismrmrd ${FFTW3_LIBRARIES} ${Boost_LIBRARIES} ${XERCESC_LIBRARIES})
+ endif(WIN32)
+ 	INSTALL(TARGETS ismrmrd_generate_cartesian_shepp_logan DESTINATION bin)
+-ENDIF(FFTW3_FOUND)
+\ No newline at end of file
++ENDIF(FFTW3_FOUND)

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