Fix deep recursive in cmake::test().

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

diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm
index 2c52e494bf1611a829c60648d7785c6de58d7a2d..d4a98f43be2dd592531fa4312ba0da9d437947c3 100644 (file)
--- a/Debian/Debhelper/Buildsystem/cmake.pm
+++ b/Debian/Debhelper/Buildsystem/cmake.pm
@@ -16,9 +16,16 @@ sub DESCRIPTION {
 sub check_auto_buildable {
        my $this=shift;
        my ($step)=@_;
-       my $ret = -e $this->get_sourcepath("CMakeLists.txt");
-       $ret &&= $this->SUPER::check_auto_buildable(@_) if $step ne "configure";
-       return $ret;
+       if (-e $this->get_sourcepath("CMakeLists.txt")) {
+               my $ret = ($step eq "configure" && 1) ||
+                         $this->SUPER::check_auto_buildable(@_);
+               # Existence of CMakeCache.txt indicates cmake has already
+               # been used by a prior build step, so should be used
+               # instead of the parent makefile class.
+               $ret++ if ($ret && -e $this->get_buildpath("CMakeCache.txt"));
+               return $ret;
+       }
+       return 0;
 }
 
 sub new {
@@ -34,11 +41,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, @_);
 }
 
+sub test {
+       my $this=shift;
+
+       $ENV{CTEST_OUTPUT_ON_FAILURE} = 1;
+       return $this->SUPER::test(@_);
+}
+
 1