From f72b0db0446788a867c5115845b28371ab5f0e9b Mon Sep 17 00:00:00 2001 From: Modestas Vainius Date: Tue, 9 Jun 2009 14:24:04 +0300 Subject: Implement source directory switching support (Closes: #530597). * New optional option --sourcedirectory/-d. * New Buildsystem API methods for getting source directory/path (since sourcedir may no longer be topdir), source 2 build directory convertions, doit_in_sourcedir() etc. * clean_builddir() -> rmdir_builddir() rename. --- Debian/Debhelper/Buildsystem/cmake.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Debian/Debhelper/Buildsystem/cmake.pm') diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm index d1fe6899..a30fbb03 100644 --- a/Debian/Debhelper/Buildsystem/cmake.pm +++ b/Debian/Debhelper/Buildsystem/cmake.pm @@ -7,7 +7,6 @@ package Debian::Debhelper::Buildsystem::cmake; use strict; -use Debian::Debhelper::Dh_Lib; use base 'Debian::Debhelper::Buildsystem::makefile'; sub DESCRIPTION { @@ -17,7 +16,7 @@ sub DESCRIPTION { sub check_auto_buildable { my $this=shift; my ($step)=@_; - my $ret = -e "CMakeLists.txt"; + my $ret = -e $this->get_sourcepath("CMakeLists.txt"); $ret &&= $this->SUPER::check_auto_buildable(@_) if $step ne "configure"; return $ret; } @@ -43,7 +42,7 @@ sub configure { push @flags, "-DCMAKE_VERBOSE_MAKEFILE=ON"; $this->mkdir_builddir(); - $this->doit_in_builddir("cmake", $this->get_rel2builddir_path(), @flags); + $this->doit_in_builddir("cmake", $this->get_source_rel2builddir(), @flags); } 1; -- cgit v1.2.3