[ismrmrd] 89/129: d/patches/*: make utilities so private again

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Wed Jan 14 20:00:23 UTC 2015


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

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

commit 7dbdce87706b1108935b18557174cb06f04e8545
Author: Ghislain Vaillant <ghisvail at gmail.com>
Date:   Wed May 14 19:11:38 2014 +0100

    d/patches/*: make utilities so private again
---
 debian/patches/002-add-soversion.diff | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/debian/patches/002-add-soversion.diff b/debian/patches/002-add-soversion.diff
index baea812..0651be3 100644
--- a/debian/patches/002-add-soversion.diff
+++ b/debian/patches/002-add-soversion.diff
@@ -6,7 +6,7 @@ Forwarded: yes
 Bug: http://sourceforge.net/p/ismrmrd/tickets/11/
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -3,6 +3,19 @@
+@@ -3,6 +3,18 @@
  
  enable_testing()
  
@@ -21,12 +21,11 @@ Bug: http://sourceforge.net/p/ismrmrd/tickets/11/
 +  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 @@
+@@ -35,6 +47,7 @@
  
  # Add library ismrmrd
  add_library(ismrmrd SHARED ismrmrd_hdf5.cpp)
@@ -34,20 +33,3 @@ Bug: http://sourceforge.net/p/ismrmrd/tickets/11/
  
  #The findHDF5.cmake does not work very well on Windows, let's help it out
  IF(WIN32)
---- 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



More information about the debian-science-commits mailing list