build system: remove zlib-related code

As zlib is not used in the CPP-Rust Driver at all (it was used in
CPP Driver for DataStax Cloud functionalities), this commit removes all
references to zlib from the build system.

Author: wprzytula

CMakeLists.txt

@@ -47,7 +47,6 @@ option(CASS_USE_LIBSSH2 "Use libssh2 for integration tests" OFF)
 option(CASS_USE_OPENSSL "Use OpenSSL" ON)
 option(CASS_USE_STATIC_LIBS "Link static libraries when building executables" OFF)
 option(CASS_USE_STD_ATOMIC "Use std::atomic library" ON)
-option(CASS_USE_ZLIB "Use zlib" OFF)
 option(CASS_USE_TIMERFD "Use timerfd (Linux only)" ON)
 option(CASS_USE_LIBUV "Use libuv" OFF)
 

cmake/Dependencies.cmake

@@ -107,40 +107,6 @@ if(CASS_USE_OPENSSL)
   set(CASS_LIBS ${CASS_LIBS} ${OPENSSL_LIBRARIES})
 endif()
 
-#------------------------
-# ZLIB
-#------------------------
-
-if(CASS_USE_ZLIB)
-  if(NOT ZLIB_LIBRARY_NAME)
-    # Setup the root directory for zlib
-    set(ZLIB_ROOT "${PROJECT_SOURCE_DIR}/lib/zlib/"
-                  "${PROJECT_SOURCE_DIR}/build/libs/zlib/")
-    set(ZLIB_ROOT ${ZLIB_ROOT} ${ZLIB_ROOT_DIR} $ENV{ZLIB_ROOT_DIR})
-
-    # Ensure zlib was found (assign zlib include/libraries or present warning)
-    find_package(ZLIB)
-    if(ZLIB_FOUND)
-      # Determine if the static library needs to be used for Windows
-      if(WIN32 AND CASS_USE_STATIC_LIBS)
-        string(REPLACE "zlib.lib" "zlibstatic.lib" ZLIB_LIBRARIES "${ZLIB_LIBRARIES}")
-      endif()
-
-      # Assign zlib properties
-      set(CASS_INCLUDES ${CASS_INCLUDES} ${ZLIB_INCLUDE_DIRS})
-      set(CASS_LIBS ${CASS_LIBS} ${ZLIB_LIBRARIES})
-      set(HAVE_ZLIB On)
-    else()
-      message(WARNING "Could not find zlib, try to set the path to zlib root folder in the system variable ZLIB_ROOT_DIR")
-      message(WARNING "zlib libraries will not be linked into build")
-    endif()
-  else()
-    # Assign zlib properties
-    set(CASS_INCLUDES ${CASS_INCLUDES} ${ZLIB_INCLUDE_DIRS})
-    set(CASS_LIBS ${CASS_LIBS} ${ZLIB_LIBRARIES})
-  endif()
-endif()
-
 #------------------------
 # Kerberos
 #------------------------

cmake/ExternalProject-OpenSSL.cmake

@@ -25,9 +25,6 @@ if(NOT OPENSSL_VERSION)
   set(OPENSSL_VERSION "1.0.2s")
 endif()
 option(OPENSSL_INSTALL_PREFIX "OpenSSL installation prefix location")
-if(CASS_USE_ZLIB)
-  include(ExternalProject-zlib)
-endif()
 set(OPENSSL_VERSION ${OPENSSL_VERSION} CACHE STRING "OpenSSL version to build and install" FORCE)
 
 # Determine the major and minor version of OpenSSL used
@@ -91,19 +88,6 @@ else()
 endif()
 set(OPENSSL_ROOT_DIR "${OPENSSL_INSTALL_DIR}" CACHE STRING "OpenSSL root directory" FORCE)
 
-# Create build options for the platform build scripts
-if(BUILD_SHARED_LIBS)
-  if(CASS_USE_ZLIB)
-    set(OPENSSL_ZLIB_CONFIGURE_ARGUMENT "zlib-dynamic")
-    set(ZLIB_LIB zlib.lib)
-  endif()
-else()
-  if(CASS_USE_ZLIB)
-    set(OPENSSL_ZLIB_CONFIGURE_ARGUMENT "no-zlib-dynamic")
-    set(ZLIB_LIB zlibstatic.lib)
-  endif()
-endif()
-
 # Determine if shared or static library should be built
 set(OPENSSL_CONFIGURE_COMPILER "no-asm no-ssl2")
 if(BUILD_SHARED_LIBS)
@@ -273,16 +257,6 @@ file(APPEND ${OPENSSL_CONFIGURE_SCRIPT}
   "POPD\r\n"
   "SET PATH=${PERL_PATH};%PATH%\r\n"
   "CALL :SHORTENPATH \"${OPENSSL_NATIVE_INSTALL_DIR}\" SHORTENED_OPENSSL_INSTALL_DIR\r\n")
-if(CASS_USE_ZLIB)
-  # OpenSSL requires zlib paths to be relative (otherwise build errors may occur)
-  externalproject_get_property(${OPENSSL_LIBRARY_NAME} SOURCE_DIR)
-  file(RELATIVE_PATH ZLIB_INCLUDE_RELATIVE_DIR ${SOURCE_DIR} ${ZLIB_INCLUDE_DIR})
-  file(TO_NATIVE_PATH ${ZLIB_INCLUDE_RELATIVE_DIR} ZLIB_NATIVE_INCLUDE_RELATIVE_DIR)
-  file(RELATIVE_PATH ZLIB_LIBRARY_RELATIVE_DIR ${SOURCE_DIR} ${ZLIB_LIBRARY_DIR})
-  file(TO_NATIVE_PATH ${ZLIB_LIBRARY_RELATIVE_DIR} ZLIB_NATIVE_LIBRARY_RELATIVE_DIR)
-  set(OPENSSL_WITH_ZLIB_ARGUMENT "zlib ${OPENSSL_ZLIB_CONFIGURE_ARGUMENT} --with-zlib-include=\"${ZLIB_NATIVE_INCLUDE_RELATIVE_DIR}\" --with-zlib-lib=\"${ZLIB_NATIVE_LIBRARY_RELATIVE_DIR}\\${ZLIB_LIB}\"")
-  set(OPENSSL_WITH_ZLIB_ARGUMENT "zlib ${OPENSSL_ZLIB_CONFIGURE_ARGUMENT} --with-zlib-include=\"${ZLIB_INCLUDE_RELATIVE_DIR}\" --with-zlib-lib=\"${ZLIB_LIBRARY_RELATIVE_DIR}\\${ZLIB_LIB}\"")
-endif()
 file(APPEND ${OPENSSL_CONFIGURE_SCRIPT}
   "perl Configure ${OPENSSL_WITH_ZLIB_ARGUMENT} --openssldir=!SHORTENED_OPENSSL_INSTALL_DIR! --prefix=!SHORTENED_OPENSSL_INSTALL_DIR! ${OPENSSL_CONFIGURE_COMPILER}\r\n"
   "IF NOT %ERRORLEVEL% EQU 0 (\r\n"
@@ -317,10 +291,5 @@ file(APPEND ${OPENSSL_CONFIGURE_SCRIPT}
   "  FOR %%A IN (\"%~1\") DO SET %~2=%%~SA\r\n"
   "  EXIT /B\r\n")
 
-# Determine if zlib should be added as a dependency
-if(CASS_USE_ZLIB)
-  add_dependencies(${OPENSSL_LIBRARY_NAME} ${ZLIB_LIBRARY_NAME})
-endif()
-
 # Update the include directory to use OpenSSL
 include_directories(${OPENSSL_INCLUDE_DIR})

cmake/ExternalProject-zlib.cmake

@@ -14,6 +14,5 @@
 #cmakedefine HAVE_ARC4RANDOM
 #cmakedefine HAVE_GETRANDOM
 #cmakedefine HAVE_TIMERFD
-#cmakedefine HAVE_ZLIB
 
 #endif

driver_config.hpp.in

@@ -124,7 +124,6 @@ set(HAVE_BOOST_ATOMIC ${CASS_USE_BOOST_ATOMIC})
 set(HAVE_STD_ATOMIC ${CASS_USE_STD_ATOMIC})
 set(HAVE_KERBEROS ${CASS_USE_KERBEROS})
 set(HAVE_OPENSSL ${CASS_USE_OPENSSL})
-set(HAVE_ZLIB ${CASS_USE_ZLIB})
 
 # Generate the driver_config.hpp file
 configure_file(

src/CMakeLists.txt

@@ -14,6 +14,5 @@
 /* #undef HAVE_ARC4RANDOM */
 #define HAVE_GETRANDOM
 #define HAVE_TIMERFD
-#define HAVE_ZLIB
 
 #endif