From 718568b4ffc100fae3246e40458e6535456cd4f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Mayer?= <jmayer@loplof.de>
Date: Fri, 29 Nov 2013 15:40:04 +0000
Subject: [PATCH] Graham Bloice:

Always include the "true" zlib includes first. This works around a
bug in the Windows setup of GTK[23] which has a faulty zconf.h.


svn path=/trunk/; revision=53647
---
 CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 025a4b8161..d1b07c0a04 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -557,6 +557,9 @@ endif()
 # That's the name autofoo uses
 if(HAVE_LIBZLIB)
 	set(HAVE_LIBZ 1)
+	# Always include the "true" zlib includes first. This works around a
+	# bug in the Windows setup of GTK[23] which has a faulty zconf.h.
+	include_directories(BEFORE ${ZLIB_INCLUDE_DIRS})
 endif()
 if (Qt5Widgets_FOUND)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")