diff options
| author | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-04-01 10:10:48 +0000 |
|---|---|---|
| committer | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-04-01 10:10:48 +0000 |
| commit | b57692db6c8dc01f0991ad50aed7f3732e107a09 (patch) | |
| tree | a11ffcd7a83c26f821f5ba4605a294970e11006a /cmake | |
| parent | dd64dc097e1cf4aac66e564724ed9a7af858bc6c (diff) | |
Sync ZLIB from CMake trunk
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32350 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindZ.cmake | 35 | ||||
| -rw-r--r-- | cmake/modules/FindZLIB.cmake | 40 |
2 files changed, 40 insertions, 35 deletions
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)
+
|