diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-06-06 21:32:29 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-06-06 21:32:29 +0200 |
| commit | 72ba95873a6d99def07a4bfecda44fb942165142 (patch) | |
| tree | 4bcb11afc568c4894f4cb109d57c14968320a58b /cmake/zlib.cmake | |
| parent | fab9a55d077b4f2a511b273d5f51272f1e3dc1ff (diff) | |
| parent | 4749d40c635634e25e07d28ce1a04e9263bcc375 (diff) | |
| download | mariadb-git-72ba95873a6d99def07a4bfecda44fb942165142.tar.gz | |
10.0-base merge
(without InnoDB - all InnoDB changes were ignored)
Diffstat (limited to 'cmake/zlib.cmake')
| -rw-r--r-- | cmake/zlib.cmake | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake index a3960c2a9da..d2e78dd7049 100644 --- a/cmake/zlib.cmake +++ b/cmake/zlib.cmake @@ -56,12 +56,16 @@ MACRO (MYSQL_CHECK_ZLIB_WITH_COMPRESS) INCLUDE(CheckFunctionExists) SET(CMAKE_REQUIRED_LIBRARIES z) CHECK_FUNCTION_EXISTS(crc32 HAVE_CRC32) + CHECK_FUNCTION_EXISTS(compressBound HAVE_COMPRESSBOUND) + CHECK_FUNCTION_EXISTS(deflateBound HAVE_DEFLATEBOUND) SET(CMAKE_REQUIRED_LIBRARIES) - IF(HAVE_CRC32) - SET(WITH_ZLIB "system" CACHE STRING "Which zlib to use (possible values are 'bundled' or 'system')") + IF(HAVE_CRC32 AND HAVE_COMPRESSBOUND AND HAVE_DEFLATEBOUND) + SET(WITH_ZLIB "system" CACHE STRING + "Which zlib to use (possible values are 'bundled' or 'system')") SET(ZLIB_SOURCES "") ELSE() SET(ZLIB_FOUND FALSE CACHE INTERNAL "Zlib found but not usable") + MESSAGE(STATUS "system zlib found but not usable") ENDIF() ENDIF() IF(NOT ZLIB_FOUND) |