cmake: Pass CPPFLAGS in CFLAGS. Closes: #668813 Thanks, Simon Ruderich for the patch...

[debhelper.git] / Debian / Debhelper / Dh_Buildsystems.pm

diff --git a/Debian/Debhelper/Dh_Buildsystems.pm b/Debian/Debhelper/Dh_Buildsystems.pm
index 22f80f9ebdacb39435e8a952ccd9d753199a2c03..0a51a4d228ea6fa81cf5df75d8640d8e82f358a1 100644 (file)
--- a/Debian/Debhelper/Dh_Buildsystems.pm
+++ b/Debian/Debhelper/Dh_Buildsystems.pm
@@ -28,6 +28,7 @@ our @BUILDSYSTEMS = (
        "cmake",
        "ant",
        "qmake",
+       "qmake_qt4",
 );
 
 my $opt_buildsys;
@@ -159,25 +160,19 @@ sub buildsystems_init {
        );
        $args{options}{$_} = $options{$_} foreach keys(%options);
        Debian::Debhelper::Dh_Lib::init(%args);
+       Debian::Debhelper::Dh_Lib::set_buildflags();
        set_parallel($max_parallel);
 }
 
 sub set_parallel {
        my $max=shift;
 
-       $opt_parallel=1;
-
-       if (exists $ENV{DEB_BUILD_OPTIONS}) {
-               # Get number of processes from parallel=n tag limiting it
-               # with $max if needed
-               foreach my $opt (split(/\s+/, $ENV{DEB_BUILD_OPTIONS})) {
-                       if ($opt =~ /^parallel=(-?\d+)$/) {
-                               $opt_parallel = $1;
-                               if ($max > 0 && $opt_parallel > $max) {
-                                       $opt_parallel = $max;
-                               }
-                       }
-               }
+       # Get number of processes from parallel=n option, limiting it
+       # with $max if needed
+       $opt_parallel=get_buildoption("parallel") || 1;
+
+       if ($max > 0 && $opt_parallel > $max) {
+               $opt_parallel = $max;
        }
 }