From 0348a407e584265caa065b78b0122802c26ab4a1 Mon Sep 17 00:00:00 2001
From: Glenn Randers-Pehrson <glennrp at users.sourceforge.net>
Date: Tue, 16 Feb 2016 14:38:28 -0600
Subject: [PATCH] [libpng16] Add ${INCLUDES} in scripts/genout.cmake.in (Bug
 report by Nixon Kwok).

---
 ANNOUNCE                | 7 ++++---
 CHANGES                 | 5 +++--
 scripts/genout.cmake.in | 1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index dfc8d13f1..30a156749 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-Libpng 1.6.22beta03 - February 13, 2016
+Libpng 1.6.22beta03 - February 16, 2016
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -54,7 +54,7 @@ Version 1.6.22beta02 [February 8, 2016]
     extend the png_set_alpha_mode range as HDR imaging systems are starting
     to emerge.
 
-Version 1.6.22beta03 [February 13, 2016]
+Version 1.6.22beta03 [February 16, 2016]
   Added a common-law trademark notice and export control information
     to the LICENSE file, png.h, and the man page.
   Restored "& 0xff" in png_save_uint_16() and png_save_uint_32() that
@@ -62,7 +62,8 @@ Version 1.6.22beta03 [February 13, 2016]
   Changed PNG_INFO_cHNK and PNG_FREE_cHNK from 0xnnnn to 0xnnnnU in png.h
    (Robert C. Seacord).
   Removed dubious "#if INT_MAX" test from png.h that was added to
-   libpng-1.6.19bet02 (John Bowler).
+   libpng-1.6.19beta02 (John Bowler).
+  Add ${INCLUDES} in scripts/genout.cmake.in (Bug report by Nixon Kwok).
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 813a9d4c5..68c10b3fa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5513,7 +5513,7 @@ Version 1.6.22beta02 [February 8, 2016]
     extend the png_set_alpha_mode range as HDR imaging systems are starting
     to emerge.
 
-Version 1.6.22beta03 [February 13, 2016]
+Version 1.6.22beta03 [February 16, 2016]
   Added a common-law trademark notice and export control information
     to the LICENSE file, png.h, and the man page.
   Restored "& 0xff" in png_save_uint_16() and png_save_uint_32() that
@@ -5521,7 +5521,8 @@ Version 1.6.22beta03 [February 13, 2016]
   Changed PNG_INFO_cHNK and PNG_FREE_cHNK from 0xnnnn to 0xnnnnU in png.h
    (Robert C. Seacord).
   Removed dubious "#if INT_MAX" test from png.h that was added to
-   libpng-1.6.19bet02 (John Bowler).
+   libpng-1.6.19beta02 (John Bowler).
+  Add ${INCLUDES} in scripts/genout.cmake.in (Bug report by Nixon Kwok).
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/scripts/genout.cmake.in b/scripts/genout.cmake.in
index 5851c8f13..d57810b22 100644
--- a/scripts/genout.cmake.in
+++ b/scripts/genout.cmake.in
@@ -48,6 +48,7 @@ if ("${INPUTEXT}" STREQUAL ".c" AND "${OUTPUTEXT}" STREQUAL ".out")
                           ${CMAKE_C_FLAGS}
                           "-I${SRCDIR}"
                           "-I${BINDIR}"
+                          ${INCLUDES}
                           "-DPNGLIB_LIBNAME=PNG${PNGLIB_MAJOR}${PNGLIB_MINOR}_0"
                           "-DPNGLIB_VERSION=${PNGLIB_VERSION}"
                           "-DSYMBOL_PREFIX=${SYMBOL_PREFIX}"