Fix for static windows library (mariadbclient):

For static library don't build internal zlib as library, but
add sources to object library.

CMakeLists.txt

@@ -227,8 +227,6 @@ IF(WITH_EXTERNAL_ZLIB)
   ENDIF()
 ELSE()
   SET(ZLIB_INCLUDE_DIR "${CC_SOURCE_DIR}/external/zlib")
-  ADD_SUBDIRECTORY(external/zlib)
-  SET(ZLIB_LIBRARY zlib)
 ENDIF()
 INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
 

libmariadb/CMakeLists.txt

@@ -165,6 +165,30 @@ IF(CMAKE_COMPILER_IS_GNUCC AND CMAKE_BUILD_TYPE MATCHES "Release")
   SET_SOURCE_FILES_PROPERTIES(my_context.c PROPERTIES COMPILE_FLAGS -g)
 ENDIF()
 
+IF(ZLIB_FOUND AND WITH_EXTERNAL_ZLIB)
+  INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
+ELSE()
+  SET(ZLIB_SOURCES
+    ${CC_SOURCE_DIR}/external/zlib/adler32.c
+    ${CC_SOURCE_DIR}/external/zlib/compress.c
+    ${CC_SOURCE_DIR}/external/zlib/crc32.c
+    ${CC_SOURCE_DIR}/external/zlib/deflate.c
+    ${CC_SOURCE_DIR}/external/zlib/gzclose.c
+    ${CC_SOURCE_DIR}/external/zlib/gzlib.c
+    ${CC_SOURCE_DIR}/external/zlib/gzread.c
+    ${CC_SOURCE_DIR}/external/zlib/gzwrite.c
+    ${CC_SOURCE_DIR}/external/zlib/infback.c
+    ${CC_SOURCE_DIR}/external/zlib/inffast.c
+    ${CC_SOURCE_DIR}/external/zlib/inflate.c
+    ${CC_SOURCE_DIR}/external/zlib/inftrees.c
+    ${CC_SOURCE_DIR}/external/zlib/trees.c
+    ${CC_SOURCE_DIR}/external/zlib/uncompr.c
+    ${CC_SOURCE_DIR}/external/zlib/zutil.c
+  )
+  INCLUDE_DIRECTORIES(${CC_SOURCE_DIR}/external/zlib)
+ENDIF()
+
+
 SET(MARIADB_DYNCOL_SYMBOLS
  mariadb_dyncol_check
  mariadb_dyncol_column_cmp_named
@@ -259,8 +283,8 @@ SET(MARIADB_NONBLOCK_SYMBOLS
 )
 
 # handle static plugins
-SET(LIBMARIADB_SOURCES ${LIBMARIADB_PLUGIN_SOURCES})
-SET(SYSTEM_LIBS ${SYSTEM_LIBS} ${LIBMARIADB_PLUGIN_LIBS} ${INTERNAL_ZLIB_LIBRARY} ${ZSTD_LIBRARY} ${ZLIB_LIBRARY})
+SET(LIBMARIADB_SOURCES ${LIBMARIADB_SOURCES} ${LIBMARIADB_PLUGIN_SOURCES})
+SET(SYSTEM_LIBS ${SYSTEM_LIBS} ${LIBMARIADB_PLUGIN_LIBS} ${ZSTD_LIBRARY} ${ZLIB_LIBRARY})
 MESSAGE(STATUS "SYSTEM_LIBS: ${SYSTEM_LIBS}")
 ADD_DEFINITIONS(${LIBMARIADB_PLUGIN_DEFS})
 FOREACH(plugin ${PLUGINS_STATIC})
@@ -324,6 +348,7 @@ ENDIF()
 IF(ZLIB_FOUND AND WITH_EXTERNAL_ZLIB)
   INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
 ELSE()
+  SET(LIBMARIADB_SOURCES ${LIBMARIADB_SOURCES} ${ZLIB_SOURCES})
   INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/external/zlib)
 ENDIF()