[med-svn] r22720 - in trunk/packages/minc/libminc/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2016-08-25 13:27:13 +0000 (Thu, 25 Aug 2016)
New Revision: 22720

Added:
   trunk/packages/minc/libminc/trunk/debian/patches/Use-system-FindHDF5-CMake-module.patch
Modified:
   trunk/packages/minc/libminc/trunk/debian/changelog
   trunk/packages/minc/libminc/trunk/debian/patches/series
Log:
Use system FindHDF5 CMake module (thanks to Ghislain Antony Vaillant for the patch)



Modified: trunk/packages/minc/libminc/trunk/debian/changelog
===================================================================
--- trunk/packages/minc/libminc/trunk/debian/changelog	2016-08-25 09:25:07 UTC (rev 22719)
+++ trunk/packages/minc/libminc/trunk/debian/changelog	2016-08-25 13:27:13 UTC (rev 22720)
@@ -2,6 +2,9 @@
 
   * Wrote watch file
   * Use github issue tracker as contact
+  * Use system FindHDF5 CMake module (thanks to Ghislain Antony Vaillant
+    for the patch)
+    Closes: #835400
 
  -- Andreas Tille <tille at debian.org>  Thu, 03 Dec 2015 08:59:47 +0100
 

Added: trunk/packages/minc/libminc/trunk/debian/patches/Use-system-FindHDF5-CMake-module.patch
===================================================================
--- trunk/packages/minc/libminc/trunk/debian/patches/Use-system-FindHDF5-CMake-module.patch	                        (rev 0)
+++ trunk/packages/minc/libminc/trunk/debian/patches/Use-system-FindHDF5-CMake-module.patch	2016-08-25 13:27:13 UTC (rev 22720)
@@ -0,0 +1,114 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Thu, 25 Aug 2016 13:20:22 +0100
+Subject: Use system FindHDF5 CMake module.
+
+---
+ CMakeLists.txt               |  5 +--
+ cmake-modules/FindHDF5.cmake | 81 --------------------------------------------
+ 2 files changed, 3 insertions(+), 83 deletions(-)
+ delete mode 100644 cmake-modules/FindHDF5.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index df996ed..8eeb50b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,9 +59,10 @@ IF(NOT LIBMINC_EXTERNALLY_CONFIGURED)
+ 
+   # external packages
+   FIND_PACKAGE(ZLIB REQUIRED)
+-  FIND_PACKAGE(HDF5 REQUIRED)
++  FIND_PACKAGE(HDF5 COMPONENTS C REQUIRED)
+   SET(HAVE_ZLIB ON)
+-  set(HDF5_LIBRARY ${HDF5_C_LIBRARIES})
++  set(HDF5_LIBRARY ${HDF5_LIBRARIES})
++  set(HDF5_INCLUDE_DIR ${HDF5_INCLUDE_DIRS})
+ ELSE(NOT LIBMINC_EXTERNALLY_CONFIGURED)
+   #TODO: set paths for HDF5 etc
+ ENDIF(NOT LIBMINC_EXTERNALLY_CONFIGURED)
+diff --git a/cmake-modules/FindHDF5.cmake b/cmake-modules/FindHDF5.cmake
+deleted file mode 100644
+index 6de68d0..0000000
+--- a/cmake-modules/FindHDF5.cmake
++++ /dev/null
+@@ -1,81 +0,0 @@
+-#
+-# this module look for HDF5 (http://hdf.ncsa.uiuc.edu) support
+-# it will define the following values
+-#
+-# HDF5_INCLUDE_DIR  = where hdf5.h can be found
+-# HDF5_LIBRARY      = the library to link against (hdf5 etc)
+-# HDF5_FOUND        = set to true after finding the library
+-#
+-
+-IF(EXISTS ${PROJECT_CMAKE}/Hdf5Config.cmake)
+-  INCLUDE(${PROJECT_CMAKE}/Hdf5Config.cmake)
+-ENDIF(EXISTS ${PROJECT_CMAKE}/Hdf5Config.cmake)
+-
+-IF(Hdf5_INCLUDE_DIRS)
+-
+-  FIND_PATH(HDF5_INCLUDE_DIR hdf5.h ${Hdf5_INCLUDE_DIRS})
+-  FIND_LIBRARY(HDF5_LIBRARY hdf5 ${Hdf5_LIBRARY_DIRS})
+-
+-ELSE(Hdf5_INCLUDE_DIRS)
+-
+-  SET(TRIAL_LIBRARY_PATHS
+-    $ENV{HDF5_HOME}/lib
+-    /usr/apps/lib
+-    /usr/lib 
+-    /usr/local/lib
+-    /opt/lib
+-    /sw/lib
+-    )
+-
+-  SET(TRIAL_INCLUDE_PATHS
+-    $ENV{HDF5_HOME}/include
+-    /usr/apps/include
+-    /usr/include
+-    /opt/include
+-    /usr/local/include
+-    /sw/include
+-    )
+-
+-  IF($ENV{HDF5_DIR} MATCHES "hdf")
+-    MESSAGE(STATUS "Using environment variable HDF5_DIR.")
+-    SET(TRIAL_LIBRARY_PATHS $ENV{HDF5_DIR}/lib ${TRIAL_LIBRARY_PATHS} )
+-    SET(TRIAL_INCLUDE_PATHS $ENV{HDF5_DIR}/include ${TRIAL_INCLUDE_PATHS} )
+-  ENDIF($ENV{HDF5_DIR} MATCHES "hdf")
+-  
+-  FIND_LIBRARY(HDF5_LIBRARY hdf5 ${TRIAL_LIBRARY_PATHS})
+-  FIND_PATH(HDF5_INCLUDE_DIR hdf5.h ${TRIAL_INCLUDE_PATHS} )
+-
+-ENDIF(Hdf5_INCLUDE_DIRS)
+-
+-## -----------------------------------------------------------------------------
+-## Assign status of the search
+-
+-IF(HDF5_INCLUDE_DIR AND HDF5_LIBRARY)
+-  SET(HDF5_FOUND 1 CACHE BOOL "Found hdf5 library")
+-ELSE(HDF5_INCLUDE_DIR AND HDF5_LIBRARY)
+-  SET(HDF5_FOUND 0 CACHE BOOL "Not fount hdf5 library")
+-ENDIF(HDF5_INCLUDE_DIR AND HDF5_LIBRARY)
+-
+-## -----------------------------------------------------------------------------
+-## Feedback
+-
+-IF (HDF5_FOUND)
+-  IF (NOT HDF5_FIND_QUIETLY)
+-    MESSAGE (STATUS "Found components for HDF5")
+-    MESSAGE (STATUS "HDF5 library : ${HDF5_LIBRARY}")
+-    MESSAGE (STATUS "HDF5 headers : ${HDF5_INCLUDE_DIR}")
+-  ENDIF (NOT HDF5_FIND_QUIETLY)
+-ELSE (HDF5_FOUND)
+-  IF (HDF5_FIND_REQUIRED)
+-    MESSAGE (FATAL_ERROR "Could not find HDF5!")
+-  ENDIF (HDF5_FIND_REQUIRED)
+-ENDIF (HDF5_FOUND)
+-
+-## -----------------------------------------------------------------------------
+-## Variables marked as advanced
+-
+-MARK_AS_ADVANCED(
+-  HDF5_INCLUDE_DIR 
+-  HDF5_LIBRARY 
+-  HDF5_FOUND
+-)

Modified: trunk/packages/minc/libminc/trunk/debian/patches/series
===================================================================
--- trunk/packages/minc/libminc/trunk/debian/patches/series	2016-08-25 09:25:07 UTC (rev 22719)
+++ trunk/packages/minc/libminc/trunk/debian/patches/series	2016-08-25 13:27:13 UTC (rev 22720)
@@ -2,3 +2,4 @@
 fix-uselibminc-cmake
 use-system-nifti
 fix-endian-issues-label-data.patch
+Use-system-FindHDF5-CMake-module.patch