Sync ZLIB from CMake trunk

svn path=/trunk/; revision=32350

3 files changed, 43 insertions, 38 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8fefccc917..e30a8a52ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,7 +117,7 @@ option(ENABLE_GUIDES     "Build Guides" ON)
 option(ENABLE_ADNS       "Build with adns support" ON)
 option(ENABLE_PCRE       "Build with pcre support" ON)
 option(ENABLE_PORTAUDIO  "Build with portaudio support" ON)
-option(ENABLE_Z          "Build with zlib compression support" ON)
+option(ENABLE_ZLIB       "Build with zlib compression support" ON)
 option(ENABLE_LUA	 "Build with lua dissector support" ON)
 option(ENABLE_PYTHON	 "Build with python dissector support" ON)
 option(ENABLE_SMI	 "Build with smi snmp support" ON)
@@ -291,8 +291,8 @@ elseif(ENABLE_ADNS)     # Gnu asynchronous DNS
 endif()
 
 # Zlib compression
-if(ENABLE_Z)
-	set(PACKAGELIST Z ${PACKAGELIST})
+if(ENABLE_ZLIB)
+	set(PACKAGELIST ZLIB ${PACKAGELIST})
 endif()
 
 # Lua 5.1 dissectors
diff --git a/cmake/modules/FindZ.cmake b/cmake/modules/FindZ.cmake
deleted file mode 100644
index cf2a7dd700..0000000000
--- a/cmake/modules/FindZ.cmake
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# $Id$
-#
-# - Find zlib
-# Find the native ZLIB includes and library
-#
-#  Z_INCLUDE_DIRS - where to find zlib.h, etc.
-#  Z_LIBRARIES    - List of libraries when using zlib.
-#  Z_FOUND        - True if zlib found.
-
-
-IF (Z_INCLUDE_DIRS)
-  # Already in cache, be silent
-  SET(Z_FIND_QUIETLY TRUE)
-ENDIF (Z_INCLUDE_DIRS)
-
-FIND_PATH(Z_INCLUDE_DIR zlib.h)
-
-SET(Z_NAMES z zlib zdll)
-FIND_LIBRARY(Z_LIBRARY NAMES ${Z_NAMES} )
-
-# handle the QUIETLY and REQUIRED arguments and set Z_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Z DEFAULT_MSG Z_LIBRARY Z_INCLUDE_DIR)
-
-IF(Z_FOUND)
-  SET( Z_LIBRARIES ${Z_LIBRARY} )
-  SET( Z_INCLUDE_DIRS ${Z_INCLUDE_DIR} )
-ELSE(Z_FOUND)
-  SET( Z_LIBRARIES )
-  SET( Z_INCLUDE_DIRS )
-ENDIF(Z_FOUND)
-
-MARK_AS_ADVANCED( Z_LIBRARIES Z_INCLUDE_DIRS )
diff --git a/cmake/modules/FindZLIB.cmake b/cmake/modules/FindZLIB.cmake
new file mode 100644
index 0000000000..876635b1eb
--- /dev/null
+++ b/cmake/modules/FindZLIB.cmake
@@ -0,0 +1,40 @@
+# - Find zlib

+# Find the native ZLIB includes and library

+#

+#  ZLIB_INCLUDE_DIRS - where to find zlib.h, etc.

+#  ZLIB_LIBRARIES    - List of libraries when using zlib.

+#  ZLIB_FOUND        - True if zlib found.

+

+#=============================================================================

+# Copyright 2001-2009 Kitware, Inc.

+#

+# Distributed under the OSI-approved BSD License (the "License");

+# see accompanying file Copyright.txt for details.

+#

+# This software is distributed WITHOUT ANY WARRANTY; without even the

+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

+# See the License for more information.

+#=============================================================================

+# (To distributed this file outside of CMake, substitute the full

+#  License text for the above reference.)

+

+IF (ZLIB_INCLUDE_DIR)

+  # Already in cache, be silent

+  SET(ZLIB_FIND_QUIETLY TRUE)

+ENDIF (ZLIB_INCLUDE_DIR)

+

+FIND_PATH(ZLIB_INCLUDE_DIR zlib.h)

+

+SET(ZLIB_NAMES z zlib zdll)

+FIND_LIBRARY(ZLIB_LIBRARY NAMES ${ZLIB_NAMES} )

+MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )

+

+# Per-recommendation

+SET(ZLIB_INCLUDE_DIRS "${ZLIB_INCLUDE_DIR}")

+SET(ZLIB_LIBRARIES    "${ZLIB_LIBRARY}")

+

+# handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if 

+# all listed variables are TRUE

+INCLUDE(FindPackageHandleStandardArgs)

+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB DEFAULT_MSG ZLIB_LIBRARIES ZLIB_INCLUDE_DIRS)

+