From 16953eca30e47cad1b603dfe3134d40c1bc8b2f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Sat, 12 Jan 2019 01:53:40 +0000 Subject: [PATCH] CMake: Remove legacy workaround for GTK+Zlib MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Right now only the GTK+ 2.24.23 and GnuTLS 3.4.11 packages in trunk contain include/zconf.h, these are used by master-2.6 but not current master. Change-Id: If4e0407c83432fa0780e0ac8a2e15b92dbca8f17 Reviewed-on: https://code.wireshark.org/review/31505 Petri-Dish: João Valverde Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu Reviewed-by: Roland Knall --- CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a6b3b2029e..09297ba560 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1230,16 +1230,11 @@ else() # non-empty value, be sure to clear it when not found. set(LIBXML2_LIBRARIES "") endif() - if (HAVE_LIBWINSPARKLE) set(HAVE_SOFTWARE_UPDATE 1) endif() - if(HAVE_LIBZLIB) set(HAVE_ZLIB 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(HAVE_LIBLZ4) set(HAVE_LZ4 1)