dh_auto_configure: If there is a problem with cmake, display the CMakeCache.txt.

diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm
index d4a98f43be2dd592531fa4312ba0da9d437947c3..9e40cb728bdf4559cff429e05810a646b13ec5c5 100644 (file)
--- 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 57eb40c75744059a07fce055962adb14936d354a..ff81dc300e07c7e809b2c48e3a7c940370827bfe 100644 (file)
--- 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 <joeyh@debian.org>  Sat, 21 May 2011 15:24:19 -0400