As promised, please find the following 2 patches:

0001*.patch: fixes the installation problem reported in this bug.
0002*.patch: runs the upstream testsuite as part of the build process.

I'll see if I can do something about the packaging testsuite. Meanwhile
please
consider an upload, as I have a package coming which depends on a sane glm.
From 6365d456f715e02f3767eeaabae151cdcf7be795 Mon Sep 17 00:00:00 2001
From: Ghislain Antony Vaillant <[email protected]>
Date: Wed, 24 Aug 2016 16:44:07 +0100
Subject: [PATCH 1/2] Fix CMake package installation.

---
 debian/libglm-dev.dirs    | 1 -
 debian/libglm-dev.install | 4 ++--
 debian/rules              | 6 ++----
 3 files changed, 4 insertions(+), 7 deletions(-)
 delete mode 100644 debian/libglm-dev.dirs

diff --git a/debian/libglm-dev.dirs b/debian/libglm-dev.dirs
deleted file mode 100644
index d929d01..0000000
--- a/debian/libglm-dev.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/include/glm
diff --git a/debian/libglm-dev.install b/debian/libglm-dev.install
index 30a79f2..bb85e4b 100644
--- a/debian/libglm-dev.install
+++ b/debian/libglm-dev.install
@@ -1,3 +1,3 @@
 /usr/include/glm
-/usr/lib/*/cmake usr/lib/
-/usr/lib/*/pkgconfig usr/lib/
+/usr/lib/cmake
+/usr/lib/pkgconfig
diff --git a/debian/rules b/debian/rules
index 11906a8..bbaf477 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,5 @@
 	dh $@ --parallel
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DGLM_TEST_ENABLE=ON
-
-override_dh_auto_build:
-	dh_auto_build -- CMAKE_INSTALL_PREFIX=/usr/lib/cmake
+	dh_auto_configure -- -DCMAKE_INSTALL_LIBDIR="lib" \
+		-DGLM_TEST_ENABLE=ON
-- 
2.9.3

From 034da7d84479cab5b824136bfe6d6dbe66ac6879 Mon Sep 17 00:00:00 2001
From: Ghislain Antony Vaillant <[email protected]>
Date: Wed, 24 Aug 2016 17:47:41 +0100
Subject: [PATCH 2/2] Enable testing depending on nocheck.

---
 debian/rules | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/debian/rules b/debian/rules
index bbaf477..d9ecd90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,5 +7,17 @@
 	dh $@ --parallel
 
 override_dh_auto_configure:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	dh_auto_configure -- -DCMAKE_INSTALL_LIBDIR="lib" \
 		-DGLM_TEST_ENABLE=ON
+else
+	dh_auto_configure -- -DCMAKE_INSTALL_LIBDIR="lib" \
+		-DGLM_TEST_ENABLE=OFF
+endif
+
+# NOTE: This override may be removed in the future if upstream decides to use
+# the enable_testing() command in CMake. 
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	make -C obj-* test
+endif
-- 
2.9.3

Reply via email to