[metview] 64/97: WIP: try cmake rules

Alastair McKinstry mckinstry at moszumanska.debian.org
Tue Sep 1 09:18:54 UTC 2015


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

mckinstry pushed a commit to branch master
in repository metview.

commit 58aca97aafc15a9df27f27b313ed8d576afbcaa7
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat May 2 15:15:45 2015 +0100

    WIP: try cmake rules
---
 debian/rules | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 940fda9..d63f401 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,12 +34,18 @@ override_dh_auto_clean:
 # Also -fPIC, for some reason.
 
 override_dh_auto_configure:
+	cp debian/CONFIG.site config/CONFIG.site
+	chmod +x ./scripts/*.mv
 	dh_auto_configure -- \
+		-DMETVIEW_SITE=debian  \
+		-DCMAKE_BUILD_TYPE=Debug \
+		-DMETVIEW_EXTRA_LIBRARIES='terralib m' \
+		-DMETVIEW_EXTRA_INCLUDES='/usr/include/terralib/kernel' \
+		-DMARS_SOURCE_PATH=${CMAKE_SOURCE_DIR}/src/libMars
+	#dh_auto_configure -- \
 		--enable-magics \
 		LIBS=" -lterralib -lm" CPPFLAGS=" -I/usr/include/terralib/kernel " \
 		CXXFLAGS=" -fPIC " CFLAGS=" -fPIC"
-	cp debian/CONFIG.site config/CONFIG.site
-	chmod +x ./scripts/*.mv
 
 override_dh_auto_test:
 	@echo "Checks disabled for the moment due to syntax errors in tests" 

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



More information about the debian-science-commits mailing list