[xdmf] 25/38: Enable metis, exodusii support

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository xdmf.

commit 5a298009934b0037f04391799bdc9d22e9900ff8
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Aug 20 20:27:55 2016 +0100

    Enable metis, exodusii support
---
 debian/changelog            |  1 +
 debian/control              |  4 +++-
 debian/patches/soname.patch | 34 +++++++++++++++++++++++++++-------
 debian/rules                |  3 ++-
 4 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2c0dcee..90a59e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xdmf (3.0+git20160803-1) UNRELEASED; urgency=medium
   * Now depend on swig
   * Standards-Version: 3.9.8
   * Remove unnecessary postinst, prerm scripts
+  * Ship utils, build-depend on libmetis-dev
 
  -- Alastair McKinstry <mckinstry at debian.org>  Mon, 20 Jun 2016 13:42:30 +0100
 
diff --git a/debian/control b/debian/control
index 5e97375..e39c9eb 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,9 @@ Build-Depends: debhelper (>= 9), cmake(>= 2.4.0),
   python-all-dev, dh-python, python3-all-dev, 
   gfortran, swig, 
   bzip2, libbz2-dev,
-  libgzstream-dev
+  libgzstream-dev,
+  libmetis-dev,
+  libexodusii-dev
 Standards-Version: 3.9.8
 Homepage: http://www.xdmf.org/
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/xdmf.git
diff --git a/debian/patches/soname.patch b/debian/patches/soname.patch
index ec77676..7cb6262 100644
--- a/debian/patches/soname.patch
+++ b/debian/patches/soname.patch
@@ -3,23 +3,23 @@ Author: Alastair McKinstry <mckinstry at debian.org>
 Last-Updated: 2014-05-30
 Forwarded: not-needed
 
-Index: xdmf-2.1.dfsg.1/libsrc/CMakeLists.txt
+Index: xdmf-3.0+git20160803/libsrc/CMakeLists.txt
 ===================================================================
---- xdmf-2.1.dfsg.1.orig/libsrc/CMakeLists.txt
-+++ xdmf-2.1.dfsg.1/libsrc/CMakeLists.txt
+--- xdmf-3.0+git20160803.orig/libsrc/CMakeLists.txt
++++ xdmf-3.0+git20160803/libsrc/CMakeLists.txt
 @@ -417,6 +417,8 @@ ENDIF(VTK_BUILD_SHARED_LIBS OR BUILD_SHA
  
  ADD_LIBRARY(Xdmf ${LIBTYPE} ${XdmfSources})
  
-+SET_TARGET_PROPERTIES(Xdmf PROPERTIES  SOVERSION 2)
++SET_TARGET_PROPERTIES(Xdmf PROPERTIES  SOVERSION 3)
 +
  IF(XDMF_USE_MYSQL)
      ADD_DEFINITIONS("-DXDMF_USE_MYSQL")
      INCLUDE_DIRECTORIES(${MYSQL_INCLUDE_PATH})
-Index: xdmf-2.1.dfsg.1/vtk/CMakeLists.txt
+Index: xdmf-3.0+git20160803/vtk/CMakeLists.txt
 ===================================================================
---- xdmf-2.1.dfsg.1.orig/vtk/CMakeLists.txt
-+++ xdmf-2.1.dfsg.1/vtk/CMakeLists.txt
+--- xdmf-3.0+git20160803.orig/vtk/CMakeLists.txt
++++ xdmf-3.0+git20160803/vtk/CMakeLists.txt
 @@ -101,6 +101,7 @@ IF (VTK_FOUND)
    ENDIF(VTK_BUILD_SHARED_LIBS OR BUILD_SHARED_LIBS)
  
@@ -36,3 +36,23 @@ Index: xdmf-2.1.dfsg.1/vtk/CMakeLists.txt
      TARGET_LINK_LIBRARIES(vtk${PROJECT_NAME}TCL vtkIOTCL vtkRenderingTCL vtkParallelTCL Xdmf)
      ADD_DEPENDENCIES(vtk${PROJECT_NAME}TCL vtk${PROJECT_NAME})
    ENDIF(VTK_WRAP_TCL)
+Index: xdmf-3.0+git20160803/CMakeLists.txt
+===================================================================
+--- xdmf-3.0+git20160803.orig/CMakeLists.txt
++++ xdmf-3.0+git20160803/CMakeLists.txt
+@@ -325,6 +325,7 @@ if(NOT XDMF_BUILD_CORE_ONLY)
+ 
+   if(XDMF_STATIC_AND_SHARED)
+     add_library(XdmfObjects OBJECT ${XdmfSources})
++    SET_TARGET_PROPERTIES(XdmfObjects PROPERTIES  SOVERSION 3)
+     set_target_properties(XdmfObjects PROPERTIES
+       POSITION_INDEPENDENT_CODE True)
+     add_library(${XDMF_LIBNAME} $<TARGET_OBJECTS:XdmfObjects>)
+@@ -335,6 +336,7 @@ if(NOT XDMF_BUILD_CORE_ONLY)
+     endif (BUILD_SHARED_LIBS)
+   else()
+     add_library(${XDMF_LIBNAME} ${LIBTYPE} ${XdmfSources})
++    set_target_properties(${XDMF_LIBNAME} PROPERTIES SOVERSION 3)
+   endif()
+   if(XDMF_BUILD_DSM)
+     target_link_libraries(${XDMF_LIBNAME} XdmfCore XdmfDSM)
diff --git a/debian/rules b/debian/rules
index a8f09af..3dba480 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,8 @@ CMAKE_FLAGS:= -DXDMF_SYSTEM_ZLIB=ON -DXDMF_SYSTEM_LIBXML2=ON -DXDMF_USE_BZIP2=ON
 		-DXDMF_WRAP_PYTHON=ON \
 		-DXDMF_REGENERATE_WRAPPERS=ON \
 		-DGZSTREAM_LIBRARY=/usr/lib/$(DEB_HOST_MULTIARCH)/libgzstream.so \
-		-DBUILD_SHARED_LIBS=TRUE
+		-DBUILD_SHARED_LIBS=TRUE \
+		-DXDMF_BUILD_EXODUS_IO=ON 
 
 override_dh_auto_configure:
 	mkdir -p $(BUILD_DIRS)

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