cmake: Only pass CPPFLAGS in CFLAGS in v9.

diff --git a/Debian/Debhelper/Buildsystem/cmake.pm b/Debian/Debhelper/Buildsystem/cmake.pm
index 98029efd21100cafe3e979570d660567589cd0ab..f318b44b827e7609dc116fbb1f98131a74af449e 100644 (file)
--- a/Debian/Debhelper/Buildsystem/cmake.pm
+++ b/Debian/Debhelper/Buildsystem/cmake.pm
@@ -44,7 +44,7 @@ sub configure {
        push @flags, "-DCMAKE_VERBOSE_MAKEFILE=ON";
 
        # CMake doesn't respect CPPFLAGS, see #653916.
-       if ($ENV{CPPFLAGS}) {
+       if ($ENV{CPPFLAGS} && ! compat(8)) {
                $ENV{CFLAGS}   .= ' ' . $ENV{CPPFLAGS};
                $ENV{CXXFLAGS} .= ' ' . $ENV{CPPFLAGS};
        }

diff --git a/debian/changelog b/debian/changelog
index 86d4565eb259f0096b2841013f800b72c3f08e09..7d85a5ef082995bfceec0da5aed370937e5513c1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (9.20120418) unstable; urgency=low
+
+  * cmake: Only pass CPPFLAGS in CFLAGS in v9.
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 17 Apr 2012 16:54:39 -0400
+
 debhelper (9.20120417) unstable; urgency=low
 
   * cmake: Pass CPPFLAGS in CFLAGS. Closes: #668813