From 878f25308d548106ba126715e68776e42ee8b626 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 24 Jun 2011 14:25:35 -0400 Subject: dh_auto_configure: If there is a problem with cmake, display the CMakeCache.txt. --- Debian/Debhelper/Buildsystem/cmake.pm | 10 +++++++++- debian/changelog | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm index d4a98f43..9e40cb72 100644 --- a/Debian/Debhelper/Buildsystem/cmake.pm +++ b/Debian/Debhelper/Buildsystem/cmake.pm @@ -44,7 +44,15 @@ sub configure { push @flags, "-DCMAKE_VERBOSE_MAKEFILE=ON"; $this->mkdir_builddir(); - $this->doit_in_builddir("cmake", $this->get_source_rel2builddir(), @flags, @_); + eval { + $this->doit_in_builddir("cmake", $this->get_source_rel2builddir(), @flags, @_); + }; + if ($@) { + if (-e $this->get_buildpath("CMakeCache.txt")) { + $this->doit_in_builddir("tail -v -n +0 CMakeCache.txt"); + } + die $@; + } } sub test { diff --git a/debian/changelog b/debian/changelog index 57eb40c7..ff81dc30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ debhelper (8.1.7) UNRELEASED; urgency=low * Correct docs about multiarch and v9. Closes: #630826 * Fix example. Closes: #627534 * Fix error message. Closes: #628053 + * dh_auto_configure: If there is a problem with cmake, display + the CMakeCache.txt. -- Joey Hess Sat, 21 May 2011 15:24:19 -0400 -- cgit v1.2.3