[netcdf] 16/19: WIP: specify 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 63cfc72d32edf25fa41cf89f25e48d9385bd5e5a
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Feb 23 01:31:34 2016 +0000

    WIP: specify libs
---
 debian/rules | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 28ea438..b3cd8ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,8 +26,10 @@ override_dh_auto_configure:
 		-DENABLE_MMAP=ON \
 		-DUSE_SZIP=ON \
 	        -DHDF5_INCLUDE_DIR=$(INCDIR)/hdf5/serial \
-		-DHDF5_LIB=$(LIBDIR)/hdf5/serial/libhdf5.so \
-		-DHDF5_HL_LIB=$(LIBDIR)/hdf5/serial/libhdf5_hl.so \
+	        -DHDF5_INCLUDE_PATH=$(INCDIR)/hdf5/serial \
+		-DHDF5_LIBRARY_PATH=$(LIBRARY)/hdf5/serial \
+		-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-serial.ver
 	dh_auto_configure --builddirectory=build-pnetcdf -- \
 		-DCMAKE_SKIP_RPATH:BOOL=ON \
@@ -37,6 +39,9 @@ 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 
 	dh_auto_configure --builddirectory=build-mpi --  \
@@ -45,13 +50,14 @@ override_dh_auto_configure:
 		-DENABLE_TESTS:BOOL=ON \
 		-DENABLE_DOXYGEN:BOOL=ON \
 		-DENABLE_MMAP=ON \
-		-DHDF5_IS_PARALLEL=ON \
 		-DENABLE_PARALLEL4=ON \
 		-DENABLE_NETCDF_4=ON \
 		-DUSE_SZIP=ON \
 	        -DHDF5_INCLUDE_DIR=$(INCDIR)/hdf5/$(MPI) \
-		-DHDF5_LIB=$(LIBDIR)/hdf5/$(MPI)/libhdf5.so \
-		-DHDF5_HL_LIB=$(LIBDIR)/hdf5/$(MPI)/libhdf5_hl.so \
+	        -DHDF5_INCLUDE_PATH=$(INCDIR)/hdf5/$(MPI) \
+		-DHDF5_C_LIBRARY=$(LIBDIR)/hdf5/$(MPI)/libhdf5.so \
+		-DHDF5_HL_LIBRARY=$(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  \

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