[xdmf] 21/38: [WIP]: Testing cmake

[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 6a0e6bf105e58909f095f8fd65527b8a52b14cf6
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Aug 15 01:50:32 2016 +0100

    [WIP]: Testing cmake
---
 debian/rules | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/debian/rules b/debian/rules
index 643048c..7ef6bd7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,36 +13,39 @@ MPI:=$(ARCH_DEFAULT_MPI_IMPL)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 TMPDIR=debian/tmp
 LIBDIR=/usr/lib/${DEB_HOST_MULTIARCH}
-PY2VER:=$(shall pyversions -s)
-PY3VER:=$(shell py3versions -s)
-PYTHON_LIB:=${LIBDIR}/lib${PY2VER}.so
+PY2:=$(shall pyversions -s)
+PY3:=$(shell py3versions -s)m
 
 # FIXME: Pass different CXXFLAGS to different builds
-CXXFLAGS:= -I/usr/include/${PYVER} ${CXXFLAGS} 
+# CXXFLAGS:= -I/usr/include/${PYVER} ${CXXFLAGS} 
 
 CMAKE_FLAGS:= -DXDMF_SYSTEM_ZLIB=ON -DXDMF_SYSTEM_LIBXML2=ON -DXDMF_USE_BZIP2=ON -DXDMF_USE_GZIP=ON \
 		-DXDMF_SYSTEM_HDF5=ON \
 		-DXDMF_USE_RPATH=OFF \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DXDMF_WRAP_PYTHON=ON \
- 		-DPYTHON_INCLUDE_PATH="/usr/include/${PY2VER}" \
-		-DPYTHON_LIBRARY=${PYTHON_LIB} \
-		-DGZSTREAM_LIBRARY=/usr/lib/$(DEB_HOST_MULTIARCH)/libgzstream.so
+		-DGZSTREAM_LIBRARY=/usr/lib/$(DEB_HOST_MULTIARCH)/libgzstream.so \
+		-DBUILD_SHARED_LIBS=TRUE
 
 override_dh_auto_configure:
 	mkdir -p debian/build-mpi-2 debian/build-serial-2 debian/build-mpi-3 debian/build-serial-3
-	(cd debian/build-serial-2 && cmake ../.. \
+	(cd debian/build-serial-2 &&  \
+		HDF5_ROOT=$(LIBDIR)/hdf5/serial cmake ../.. \
 		$(CMAKE_FLAGS) \
+ 		-DPYTHON_INCLUDE_PATH=/usr/include/${PY2} \
+		-DPYTHON_LIBRARY=$(LIBDIR)/lib$(PY2).so \
 		-DXDMF_BUILD_MPI=OFF \
 		-DXDMF_SYSTEM_HDF5_IS_PARALLEL=OFF \
-  	        -DHDF5_INCLUDE_PATH=/usr/include/hdf5/serial \
-                -DHDF5_LIBRARY=$(LIBDIR)/hdf5/serial )
-	(cd debian/build-mpi-2 && cmake ../.. \
+		-DHDF5_ROOT=$(HDF5_ROOT) )
+	(cd debian/build-mpi-3 && cmake ../.. \
+		HDF5_ROOT=$(LIBDIR)/hdf5/$(MPI) cmake ../.. \
 		$(CMAKE_FLAGS) \
+ 		-DPYTHON_INCLUDE_PATH=/usr/include/${PY3} \
+		-DPYTHON_LIBRARY=$(LIBDIR)/lib$(PY3).so \
 		-DXDMF_BUILD_MPI=ON \
 		-DXDMF_SYSTEM_HDF5_IS_PARALLEL=ON \
-  	        -DHDF5_INCLUDE_PATH=/usr/include/hdf5/$(MPI) \
-                -DHDF5_LIBRARY=$(LIBDIR)/hdf5/$(MPI) )
+		-DHDF5_ROOT=$(HDF5_ROOT) )
+
 
 override_dh_auto_build:
 	$(MAKE) -C debian/build-serial-2
@@ -57,13 +60,13 @@ override_dh_auto_install:
 	dh_auto_install
 	# dh_install can't rename, so do it manually.
 	mkdir -p $(TMPDIR)/$(LIBDIR)
-	mv $(TMPDIR)/usr/lib/libXdmf.so.2	      $(TMPDIR)/$(LIBDIR)/libXdmf.so.2.1
+	mv $(TMPDIR)/usr/lib/libXdmf.so.3	      $(TMPDIR)/$(LIBDIR)/libXdmf.so.3.0
 	mkdir -p $(TMPDIR)/$(LIBDIR)/cmake
 	mv $(TMPDIR)/usr/lib/XdmfCMake	$(TMPDIR)/$(LIBDIR)/cmake
 	# Fix perms.
 	find Examples -type f -exec chmod -x {} \;
-	dh_link -p libxdmf-dev $(LIBDIR)/libXdmf.so.2.1	 $(LIBDIR)/libXdmf.so
-	dh_link -p libxdmf2 $(LIBDIR)/libXdmf.so.2.1	 $(LIBDIR)/libXdmf.so.2
+	dh_link -p libxdmf-dev $(LIBDIR)/libXdmf.so.3.0	 $(LIBDIR)/libXdmf.so
+	dh_link -p libxdmf2 $(LIBDIR)/libXdmf.so.3.0	 $(LIBDIR)/libXdmf.so.3
 	# https://bugs.launchpad.net/ubuntu/+source/xdmf/+bug/1154071
 	sed -e 's%@ARCH@%$(DEB_HOST_MULTIARCH)%' < debian/cmake.patch.in > debian/cmake.patch
 	(cd $(TMPDIR)/$(LIBDIR)/cmake/XdmfCMake && patch < ../../../../../../cmake.patch )

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