cmake: Only pass CPPFLAGS in CFLAGS in v9.

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

diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm
index cddd4b49e8375d3b24769db616dbf39cf823f4b8..f318b44b827e7609dc116fbb1f98131a74af449e 100644 (file)
--- a/Debian/Debhelper/Buildsystem/cmake.pm
+++ b/Debian/Debhelper/Buildsystem/cmake.pm
@@ -43,6 +43,12 @@ sub configure {
        push @flags, "-DCMAKE_INSTALL_PREFIX=/usr";
        push @flags, "-DCMAKE_VERBOSE_MAKEFILE=ON";
 
+       # CMake doesn't respect CPPFLAGS, see #653916.
+       if ($ENV{CPPFLAGS} && ! compat(8)) {
+               $ENV{CFLAGS}   .= ' ' . $ENV{CPPFLAGS};
+               $ENV{CXXFLAGS} .= ' ' . $ENV{CPPFLAGS};
+       }
+
        $this->mkdir_builddir();
        eval { 
                $this->doit_in_builddir("cmake", $this->get_source_rel2builddir(), @flags, @_);