[netcdf] 17/19: WIP: find MPI libs

[Alastair McKinstry]

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

mckinstry pushed a commit to branch dev-coinstallable
in repository netcdf.

commit c1d7eea9f21dbebf039a4c95b813c8a9be0dcc6c
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Apr 12 19:31:22 2016 +0100

    WIP: find MPI libs
---
 debian/rules | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index b3cd8ec..f55528c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,8 +39,6 @@ override_dh_auto_configure:
 		-DENABLE_DOXYGEN:BOOL=ON \
 		-DENABLE_PNETCDF=ON \
 		-DPNETCDF_INCLUDE_DIR=/usr/include \
-		-DHDF5_C_LIBRARY=$(LIBDIR)/hdf5/serial/libhdf5.so \
-		-DHDF5_HL_LIBRARY=$(LIBDIR)/hdf5/serial/libhdf5_hl.so \
 		-DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,$(CURDIR)/debian/netcdf-pnetcdf.ver \
 		-DCMAKE_C_COMPILER=mpicc  \
 		-DNETCDF_LIB_NAME=netcdf_pnetcdf 
@@ -53,16 +51,21 @@ override_dh_auto_configure:
 		-DENABLE_PARALLEL4=ON \
 		-DENABLE_NETCDF_4=ON \
 		-DUSE_SZIP=ON \
+		-DUSE_HDF5=ON \
 	        -DHDF5_INCLUDE_DIR=$(INCDIR)/hdf5/$(MPI) \
 	        -DHDF5_INCLUDE_PATH=$(INCDIR)/hdf5/$(MPI) \
 		-DHDF5_C_LIBRARY=$(LIBDIR)/hdf5/$(MPI)/libhdf5.so \
 		-DHDF5_HL_LIBRARY=$(LIBDIR)/hdf5/$(MPI)/libhdf5_hl.so \
+		-DHDF5_C_LIBRARIES=$(LIBDIR)/hdf5/$(MPI)/libhdf5.so \
+		-DHDF5_HL_LIBRARIES=$(LIBDIR)/hdf5/$(MPI)/libhdf5_hl.so \
 		-DHDF5_LIBRARY_PATH=$(LIBRARY)/hdf5/$(MPI) \
 		-DCMAKE_C_FLAGS="${CFLAGS} -DHDF5_PARALLEL" \
 		-DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,$(CURDIR)/debian/netcdf-mpi.ver \
 		-DCMAKE_C_COMPILER=mpicc  \
 		-DNETCDF_LIB_NAME=netcdf_mpi
 
+
+
 override_dh_auto_build:
 	$(MAKE) -C build-serial 
 	$(MAKE) -C build-pnetcdf

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git