[netcdf] 24/31: Merge common CMAKE_FLAGS; add BUILD_TYPE=Release

[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 2a4c5720ee131c07b9b45bbd57b11c3bffcf2e17
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Oct 5 04:43:07 2016 +0100

    Merge common CMAKE_FLAGS; add BUILD_TYPE=Release
---
 debian/rules | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/debian/rules b/debian/rules
index 4e25b1d..fa3eac8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-#export DH_VERBOSE=1
-
 # Enable hardening build flags, except:
 #  pie: causes build failure
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
@@ -12,7 +10,7 @@ INCDIR:=/usr/include
 
 UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
 SO_MAJOR:=11
-SO_VERSION:=11.0.0
+SO_VERSION:=11.3.0
 
 include /usr/share/mpi-default-dev/debian_defaults
 MPI:=$(ARCH_DEFAULT_MPI_IMPL)
@@ -26,39 +24,32 @@ CFLAGS:= $(shell dpkg-buildflags --get CFLAGS)
 %:
 	dh $@ --buildsystem=cmake --parallel
 
-override_dh_auto_configure:
-	dh_auto_configure --builddirectory=build-serial -- \
+CMAKE_FLAGS:=   -DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_SKIP_RPATH:BOOL=ON \
 		-DENABLE_TESTS:BOOL=ON \
 		-DENABLE_DOXYGEN:BOOL=ON \
 		-DENABLE_MMAP=ON \
-		-DUSE_SZIP=ON \
+		-DUSE_SZIP=ON 
+
+override_dh_auto_configure:
+	dh_auto_configure --builddirectory=build-serial -- \
+		$(CMAKE_FLAGS) \
 	        -DHDF5_INCLUDE_DIR=$(INCDIR)/hdf5/serial \
-		-DHDF5_C_LIBRARY=$(LIBDIR)/hdf5/serial/libhdf5.so \
-		-DHDF5_HL_LIBRARY=$(LIBDIR)/hdf5/serial/libhdf5_hl.so \
-		-DHDF5_C_LIBRARIES=$(LIBDIR)/hdf5/serial/libhdf5.so \
-		-DHDF5_HL_LIBRARIES=$(LIBDIR)/hdf5/serial/libhdf5_hl.so \
-		-DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,$(CURDIR)/debian/netcdf-serial.ver
+		-DHDF5_LIBRARY_PATH=$(LIBRARY)/hdf5/serial \
+		-DLIBLIB_VERSION_SCRIPT=-Wl,--version-script,$(CURDIR)/debian/netcdf-serial.ver \
+		-DNETCDF_LIB_NAME=netcdf_serial
 	dh_auto_configure --builddirectory=build-pnetcdf -- \
-		-DCMAKE_SKIP_RPATH:BOOL=ON \
+		$(CMAKE_FLAGS)
 		-DHDF5_INCLUDE_DIR=$(INCDIR)/hdf5/serial \
 		-DHDF5_LIBRARY_PATH=$(LIBRARY)/hdf5/serial \
-		-DENABLE_TESTS:BOOL=ON \
-		-DENABLE_MMAP=ON \
-		-DUSE_SZIP=ON \
-		-DENABLE_DOXYGEN:BOOL=ON \
 		-DENABLE_PNETCDF=ON \
 		-DPNETCDF_INCLUDE_DIR=/usr/include \
 		-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 --  \
-		-DCMAKE_SKIP_RPATH:BOOL=ON \
+		$(CMAKE_FLAGS)
 		-DENABLE_PARALLEL_TESTS:BOOL=OFF \
-		-DENABLE_TESTS:BOOL=ON \
-		-DENABLE_DOXYGEN:BOOL=ON \
-		-DENABLE_MMAP=ON \
-		-DUSE_SZIP=ON \
 		-DUSE_HDF5=ON \
 	        -DHDF5_INCLUDE_DIR=$(INCDIR)/hdf5/$(MPI) \
 		-DHDF5_LIBRARY_PATH=$(LIBRARY)/hdf5/$(MPI) \

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