[emos] 03/37: WIP: First cut of cmake-based build

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository emos.

commit 9d4a96b4ce8b600815b2f19bd53e22afcbee694a
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun May 10 01:06:45 2015 +0100

    WIP: First cut of cmake-based build
---
 debian/changelog |  5 +++--
 debian/control   |  4 +++-
 debian/rules     | 32 +++++++++++++++++---------------
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6ddc090..7c6b0f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-emoslib (000403+dfsg.1-1) UNRELEASED; urgency=medium
+emoslib (000403+dfsg.1-2) UNRELEASED; urgency=medium
 
   * New upstream release
   * Standards-Version: 3.9.6
+  * Switch to cmake-based buildsystem. Lots more dependencies and code. 
 
- -- Alastair McKinstry <mckinstry at debian.org>  Thu, 07 May 2015 13:04:53 +0100
+ -- Alastair McKinstry <mckinstry at debian.org>  Sun, 10 May 2015 00:45:47 +0100
 
 emoslib (000392+dfsg.1-3) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 20f0819..2f4d855 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,9 @@ Source: emoslib
 Section: utils
 Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
-Build-Depends: debhelper (>=9), dh-autoreconf (>= 4), gfortran, autoconf, automake, libgrib-api-dev (>= 1.9.9~)
+Build-Depends: debhelper (>=9), gfortran, cmake, 
+ libboost-dev, libgrib-api-dev (>= 1.9.9~), libpng12-dev, zlib1g-dev,
+ libjasper-dev, libopenjpeg-dev
 Standards-Version: 3.9.6
 Homepage: http://www.ecmwf.int/products/data/software/interpolation.html
 
diff --git a/debian/rules b/debian/rules
index 83115e5..c55cf45 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,36 +1,38 @@
 #!/usr/bin/make -f
 
-# export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 # The magic debhelper  rule
 %:
-	dh $@  --with autoreconf
+	dh $@ --buildsystem=cmake
 
 DESTDIR:=`pwd`/debian/tmp/
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
 SUBDIRS=" gribex interpolation bufrdc crexdc pbio fft bufrtables grib_api_merging" 
+
 override_dh_auto_clean:
-	$(MAKE) ARCH=linux CNAME=_gfortran clean
-	rm -f libemos* debian/libemos*.so.* gribex/config.h
-	rm -f .r64 .emos bufrdc/*.o fft/*.o grib_api_merging/*.o
 	find bufrtables -type l -delete
 
-override_dh_auto_test:
-	@echo "Tests not available"
 
-override_dh_auto_build:
-	( cd gribex && ln -sf ../config.h config.h )
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DBUILD_SHARED_LIBS=ON \
+		-DBUFR_TABLES_PATH=/usr/share/emos/bufrtables
+
+# override_dh_auto_build:
+	# ( cd gribex && ln -sf ../config.h config.h )
 	# First build libemos.a
-	$(MAKE) SUBDIRS=$(SUBDIRS) ARCH=linux CNAME=_gfortran A64= R64= GRIB_API_MERGING=grib_api_merging clean all
+	# $(MAKE) SUBDIRS=$(SUBDIRS) ARCH=linux CNAME=_gfortran A64= R64= GRIB_API_MERGING=grib_api_merging clean all
 	# Then rebuild pic for objects ...
-	$(MAKE) SUBDIRS=$(SUBDIRS) ARCH=linux CNAME=_gfortran+pic A64= R64= GRIB_API_MERGING=grib_api_merging clean all
+	# $(MAKE) SUBDIRS=$(SUBDIRS) ARCH=linux CNAME=_gfortran+pic A64= R64= GRIB_API_MERGING=grib_api_merging clean all
 	# Link them into libemos.so
-	$(MAKE) -f debian/build-shlib R64= DESTDIR=$(DESTDIR) LIBDIR=$(LIBDIR)
+	# $(MAKE) -f debian/build-shlib R64= DESTDIR=$(DESTDIR) LIBDIR=$(LIBDIR)
 	# And repeat for 64-bit reals.
-	$(MAKE) SUBDIRS=$(SUBDIRS) ARCH=linux CNAME=_gfortran R64=R64 A64= GRIB_API_MERGING=grib_api_merging clean all 
-	$(MAKE) SUBDIRS=$(SUBDIRS) ARCH=linux CNAME=_gfortran+pic  R64=R64 A64= GRIB_API_MERGING=grib_api_merging clean all 
-	$(MAKE) -f debian/build-shlib R64=R64 DESTDIR=$(DESTDIR) LIBDIR=$(LIBDIR)
+	# $(MAKE) SUBDIRS=$(SUBDIRS) ARCH=linux CNAME=_gfortran R64=R64 A64= GRIB_API_MERGING=grib_api_merging clean all 
+	# $(MAKE) SUBDIRS=$(SUBDIRS) ARCH=linux CNAME=_gfortran+pic  R64=R64 A64= GRIB_API_MERGING=grib_api_merging clean all 
+	# $(MAKE) -f debian/build-shlib R64=R64 DESTDIR=$(DESTDIR) LIBDIR=$(LIBDIR)
 
 override_dh_auto_install:
 	chmod a-x examples/*/*

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