diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-12-30 15:50:20 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-12-30 18:30:29 +0100 |
| commit | 67240858b2bfa0afc436d88fc9da0595e1391b60 (patch) | |
| tree | 27dc23ebefa72cb2fd7aaa02722da3ba424bbf9e /cmake | |
| parent | cf9070a8f7dec309878e464b277db7dbb3556cf0 (diff) | |
| parent | aeefd26ecb1089678e343c64998749e9f2e3a1e4 (diff) | |
| download | mariadb-git-67240858b2bfa0afc436d88fc9da0595e1391b60.tar.gz | |
Merge branch '10.1' into 10.2mariadb-10.2.21
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() |