Fix zlib cmake

Add support for the locally modified version of zlib to suppress
a CMake warning and disable building of the zlib examples.

Change-Id: I9ae08b49d149951e8626d506f69f1757a1ec7e23
Reviewed-on: https://code.wireshark.org/review/8706
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>

4 files changed, 12 insertions, 13 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c02208753..a1d963ac92 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -697,15 +697,13 @@ endif()
 if(ENABLE_ZLIB)
 	if (WIN32)
 		# On Windows we build our own version of zlib, so add the paths
-		set(ZLIB_SRC_DIR "${_PROJECT_LIB_DIR}/zlib-1.2.8")
+		set(ZLIB_SRC_DIR "${_PROJECT_LIB_DIR}/zlib-1.2.8-ws")
 		add_subdirectory("${ZLIB_SRC_DIR}" "${CMAKE_BINARY_DIR}/zlib")
 		set(ZLIB_INCLUDE_DIR  "${ZLIB_SRC_DIR}" "${CMAKE_BINARY_DIR}/zlib")
 		set(ZLIB_LIBRARY zlib)
-		# Annoyingly zlib also builds some other stuff we aren't interested in
 		set_target_properties(zlib PROPERTIES FOLDER "Libs/zlib")
+		# Annoyingly zlib also builds some other stuff we aren't interested in
 		set_target_properties(zlibstatic PROPERTIES FOLDER "Libs/zlib")
-		set_target_properties(example PROPERTIES FOLDER "Libs/zlib")
-		set_target_properties(minigzip PROPERTIES FOLDER "Libs/zlib")
 	endif()
 	set(PACKAGELIST ${PACKAGELIST} ZLIB)
 endif()
diff --git a/Makefile.nmake b/Makefile.nmake
index de21cb4bc8..3cad4438f6 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1054,7 +1054,7 @@ process_libs:
 !ENDIF
 !IFDEF ZLIB_DIR
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
-		. zlib128.zip \
+		. zlib-1.2.8-ws.zip \
 		"$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
 !ENDIF
 !IFDEF LUA_DIR
@@ -1173,6 +1173,7 @@ clean_setup:
 	rm -r -f zlib125
 	rm -r -f zlib-1.2.5
 	rm -r -f zlib-1.2.8
+	rm -r -f zlib-1.2.8-ws
 	rm -r -f zlib123-dll
 	rm -r -f AirPcap_Devpack_1_0_0_594
 	rm -r -f AirPcap_Devpack_4_0_0_1480
diff --git a/config.nmake b/config.nmake
index 8b169bedc0..c52c201ba1 100644
--- a/config.nmake
+++ b/config.nmake
@@ -251,7 +251,7 @@ PCAP_NG_DEFAULT=^#define PCAP_NG_DEFAULT 1
 WANT_PACKET_EDITOR=^#define WANT_PACKET_EDITOR 1
 
 !if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
-DOWNLOAD_TAG=2015-04-06
+DOWNLOAD_TAG=2015-05-30
 ##### Win32 Libraries #####
 #
 # Mandatory: GLib settings
@@ -384,7 +384,7 @@ PCAP_REMOTE=1
 #
 # If you don't have Zlib, comment this line out, so that ZLIB_DIR isn't
 # defined.
-ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib-1.2.8
+ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib-1.2.8-ws
 
 #
 # Optional: the ADNS library enables asynchronous (nonblocking) DNS
@@ -512,7 +512,7 @@ GEOIP_PKG=1.5.1-2
 WINSPARKLE_PKG=0.3-44-g2c8d9d3-win32ws
 
 !else
-DOWNLOAD_TAG=2015-04-06
+DOWNLOAD_TAG=2015-05-30
 ##### Win64 Libraries #####
 #
 # Mandatory: GLib settings
@@ -636,7 +636,7 @@ PCAP_REMOTE=1
 # If you don't have Zlib, comment this line out, so that ZLIB_DIR isn't
 # defined.
 #
-ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib-1.2.8
+ZLIB_DIR=$(WIRESHARK_LIB_DIR)\zlib-1.2.8-ws
 
 #
 # Optional: the ADNS library enables asynchronous (nonblocking) DNS
diff --git a/tools/win-setup.ps1 b/tools/win-setup.ps1
index 83d9a6c995..0e3f55a832 100644
--- a/tools/win-setup.ps1
+++ b/tools/win-setup.ps1
@@ -101,8 +101,8 @@ Param(
 # trouble instead of trying to catch exceptions everywhere.
 $ErrorActionPreference = "Stop"
 
-$Win64CurrentTag = "2015-04-06"
-$Win32CurrentTag = "2015-04-06"
+$Win64CurrentTag = "2015-05-30"
+$Win32CurrentTag = "2015-05-30"
 
 # Archive file / subdir.
 $Win64Archives = @{
@@ -119,7 +119,7 @@ $Win64Archives = @{
     "user-guide-g7ea0d6c.zip" = "user-guide";
     "WinSparkle-0.3-44-g2c8d9d3-win64ws.zip" = "";
     "WpdPack_4_1_2.zip" = "";
-    "zlib128.zip" = "";
+    "zlib-1.2.8-ws.zip" = "";
 }
 
 $Win32Archives = @{
@@ -136,7 +136,7 @@ $Win32Archives = @{
     "user-guide-g7ea0d6c.zip" = "user-guide";
     "WinSparkle-0.3-44-g2c8d9d3-win32ws.zip" = "";
     "WpdPack_4_1_2.zip" = "";
-    "zlib128.zip" = "";
+    "zlib-1.2.8-ws.zip" = "";
 }
 
 # Lua