From: Joey Hess <joey@kitenet.net>
Date: Fri, 24 Jun 2011 18:25:35 +0000 (-0400)
Subject: dh_auto_configure: If there is a problem with cmake, display the CMakeCache.txt.
X-Git-Tag: 8.9.0~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=878f25308d548106ba126715e68776e42ee8b626;p=debhelper.git

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 d4a98f4..9e40cb7 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 57eb40c..ff81dc3 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 <joeyh@debian.org>  Sat, 21 May 2011 15:24:19 -0400