diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-12-20 09:15:01 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-12-20 09:15:01 +0100 |
| commit | 8634f7e5285021370c100850a7d1a4ee0dc1c93e (patch) | |
| tree | f84f50ea07aa742c21000877f26e7555f46c387e /cmake | |
| parent | f16d4d4c6ee81cfee3b0d1cb2f2219b1fa982e2e (diff) | |
| parent | b0fd06a6f27212cee770961171439a44626d8f14 (diff) | |
| download | mariadb-git-8634f7e5285021370c100850a7d1a4ee0dc1c93e.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/zlib.cmake | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake index 4b7faacc466..e269c473f36 100644 --- a/cmake/zlib.cmake +++ b/cmake/zlib.cmake @@ -34,11 +34,6 @@ ENDMACRO() MACRO (MYSQL_CHECK_ZLIB_WITH_COMPRESS) - # For NDBCLUSTER: Use bundled zlib by default - IF (NOT WITH_ZLIB) - SET(WITH_ZLIB "bundled" CACHE STRING "By default use bundled zlib on this platform") - ENDIF() - IF(WITH_ZLIB STREQUAL "bundled") MYSQL_USE_BUNDLED_ZLIB() ELSE() |