Enable verbose ctest output on test failure

[debhelper.git] / Debian / Debhelper / Buildsystem / cmake.pm

diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm
index 5662874089c2c51944839be361503a24b886a694..645c8c03faf6b16e7c6e1f7b7431a7b6cc6afe88 100644 (file)
--- a/Debian/Debhelper/Buildsystem/cmake.pm
+++ b/Debian/Debhelper/Buildsystem/cmake.pm
@@ -24,8 +24,7 @@ sub check_auto_buildable {
 sub new {
        my $class=shift;
        my $this=$class->SUPER::new(@_);
-       # Prefer out of source tree building.
-       $this->enforce_out_of_source_building(@_);
+       $this->prefer_out_of_source_building(@_);
        return $this;
 }
 
@@ -35,11 +34,17 @@ sub configure {
 
        # Standard set of cmake flags
        push @flags, "-DCMAKE_INSTALL_PREFIX=/usr";
-       push @flags, "-DCMAKE_SKIP_RPATH=ON";
        push @flags, "-DCMAKE_VERBOSE_MAKEFILE=ON";
 
        $this->mkdir_builddir();
-       $this->doit_in_builddir("cmake", $this->get_source_rel2builddir(), @flags);
+       $this->doit_in_builddir("cmake", $this->get_source_rel2builddir(), @flags, @_);
 }
 
-1;
+sub test {
+       my $this=shift;
+
+       $ENV{CTEST_OUTPUT_ON_FAILURE} = 1;
+       return $this->test(@_);
+}
+
+1