Tokudb made compilig.

storage/tokudb/CMakeLists.txt

@@ -46,7 +46,7 @@ SET(TOKUDB_PLUGIN_DYNAMIC "ha_tokudb")
 SET(TOKUDB_SOURCES ha_tokudb.cc)
 MYSQL_ADD_PLUGIN(tokudb ${TOKUDB_SOURCES} STORAGE_ENGINE MODULE_ONLY
     COMPONENT "tokudb-engine"
-    LINK_LIBRARIES tokufractaltree_static tokuportability_static z stdc++)
+    LINK_LIBRARIES tokufractaltree_static tokuportability_static ${ZLIB_LIBRARY} stdc++)
 SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin")
 
 IF (INSTALL_SYSCONF2DIR)

storage/tokudb/ft-index/ft/CMakeLists.txt

@@ -87,14 +87,14 @@ add_dependencies(ft_static install_tdb_h generate_log_code build_lzma)
 
 ## link with lzma (which should be static) and link dependers with zlib
 target_link_libraries(ft LINK_PRIVATE util_static lzma ${LIBTOKUPORTABILITY})
-target_link_libraries(ft LINK_PUBLIC z)
+target_link_libraries(ft LINK_PUBLIC ${ZLIB_LIBRARY} )
 target_link_libraries(ft_static LINK_PRIVATE lzma)
 
 ## build the bins in this directory
 foreach(tool tokuftdump tdb_logprint tdb-recover ftverify)
   add_executable(${tool} ${tool}.cc)
   add_dependencies(${tool} install_tdb_h)
-  target_link_libraries(${tool} ft_static util_static z lzma ${LIBTOKUPORTABILITY}_static ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_SYSTEM_LIBS})
+  target_link_libraries(${tool} ft_static util_static ${ZLIB_LIBRARY} lzma ${LIBTOKUPORTABILITY}_static ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_SYSTEM_LIBS})
   add_space_separated_property(TARGET ${tool} COMPILE_FLAGS -fvisibility=hidden)
 endforeach(tool)
 

storage/tokudb/ft-index/src/CMakeLists.txt

@@ -19,7 +19,7 @@ set(tokudb_srcs
 add_library(${LIBTOKUDB} SHARED ${tokudb_srcs})
 add_dependencies(${LIBTOKUDB} install_tdb_h generate_log_code)
 target_link_libraries(${LIBTOKUDB} LINK_PRIVATE locktree_static ft_static util_static lzma ${LIBTOKUPORTABILITY})
-target_link_libraries(${LIBTOKUDB} LINK_PUBLIC z)
+target_link_libraries(${LIBTOKUDB} LINK_PUBLIC ${ZLIB_LIBRARY} )
 
 ## make the static library
 add_library(tokudb_static_conv STATIC ${tokudb_srcs})

storage/tokudb/ft-index/src/tests/CMakeLists.txt

@@ -360,7 +360,7 @@ if(BUILD_TESTING OR BUILD_SRC_TESTS)
   ## #5138 only reproduces when using the static library.
   list(REMOVE_ITEM tdb_bins test-5138.tdb)
   add_executable(test-5138.tdb test-5138.cc)
-  target_link_libraries(test-5138.tdb ${LIBTOKUDB}_static z ${LIBTOKUPORTABILITY}_static ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_SYSTEM_LIBS})
+  target_link_libraries(test-5138.tdb ${LIBTOKUDB}_static ${ZLIB_LIBRARY} ${LIBTOKUPORTABILITY}_static ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_SYSTEM_LIBS})
   set_property(TARGET test-5138.tdb APPEND PROPERTY
     COMPILE_DEFINITIONS "USE_TDB;IS_TDB=1;TOKUDB=1")
   add_space_separated_property(TARGET test-5138.tdb COMPILE_FLAGS -fvisibility=hidden)

storage/tokudb/ft-index/utils/CMakeLists.txt

@@ -5,7 +5,7 @@ foreach(util ${utils})
   add_executable(${util} ${util}.cc)
   set_target_properties(${util} PROPERTIES
     COMPILE_DEFINITIONS "IS_TDB=1;USE_TDB=1;TDB_IS_STATIC=1")
-  target_link_libraries(${util} ${LIBTOKUDB}_static ft_static z lzma ${LIBTOKUPORTABILITY}_static ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_SYSTEM_LIBS})
+  target_link_libraries(${util} ${LIBTOKUDB}_static ft_static ${ZLIB_LIBRARY} lzma ${LIBTOKUPORTABILITY}_static ${CMAKE_THREAD_LIBS_INIT} ${EXTRA_SYSTEM_LIBS})
 
   add_space_separated_property(TARGET ${util} COMPILE_FLAGS -fvisibility=hidden)