macos build fixes

cmake/libraries/boost.cmake

@@ -128,10 +128,12 @@ if(PROJECT_ENABLE_BOOST)
           --with-libraries=atomic,chrono,date_time,filesystem,iostreams,locale,log,program_options,random,regex,serialization,system,test,thread
         BUILD_COMMAND
           ./b2
+          -sNO_BZIP2=1
           -j$ENV{CMAKE_BUILD_PARALLEL_LEVEL}
           ${BOOST_BUILD_ARGS}
         INSTALL_COMMAND
           ./b2
+          -sNO_BZIP2=1
           -j$ENV{CMAKE_BUILD_PARALLEL_LEVEL}
           ${BOOST_BUILD_ARGS}
           install
@@ -142,9 +144,6 @@ if(PROJECT_ENABLE_BOOST)
       if (NOT CMAKE_HOST_WIN32)
         add_dependencies(boost_project openssl_project)
       endif()
-      if (PROJECT_IS_DARWIN)
-        add_dependencies(boost_project zlib_project)
-      endif()
     endif()
   endif()
 endif()

cmake/libraries/cpp_httplib.cmake

@@ -32,8 +32,5 @@ if(PROJECT_ENABLE_CPP_HTTPLIB)
     if (NOT CMAKE_HOST_WIN32)
       add_dependencies(cpphttplib_project openssl_project)
     endif()
-    if (PROJECT_IS_DARWIN)
-      add_dependencies(cpphttplib_project zlib_project)
-    endif()
   endif()
 endif()

cmake/libraries/curl.cmake

@@ -52,9 +52,5 @@ if(PROJECT_ENABLE_CURL)
     if (NOT CMAKE_HOST_WIN32)
       add_dependencies(curl_project openssl_project)
     endif()
-
-    if (PROJECT_IS_DARWIN)
-      add_dependencies(curl_project zlib_project)
-    endif()
   endif()
 endif()

cmake/libraries/json.cmake

@@ -25,9 +25,5 @@ if(PROJECT_ENABLE_JSON)
     )
 
     list(APPEND PROJECT_DEPENDENCIES json_project)
-
-    if (PROJECT_IS_DARWIN)
-      add_dependencies(json_project zlib_project)
-    endif()
   endif()
 endif()

cmake/libraries/libsodium.cmake

@@ -44,9 +44,5 @@ if(PROJECT_ENABLE_LIBSODIUM)
     )
 
     list(APPEND PROJECT_DEPENDENCIES libsodium_project)
-
-    if (PROJECT_IS_DARWIN)
-      add_dependencies(libsodium_project zlib_project)
-    endif()
   endif()
 endif()

cmake/libraries/openssl.cmake

@@ -55,8 +55,5 @@ if(PROJECT_ENABLE_OPENSSL)
     )
 
     list(APPEND PROJECT_DEPENDENCIES openssl_project)
-    if (PROJECT_IS_DARWIN)
-      add_dependencies(openssl_project zlib_project)
-    endif()
   endif()
 endif()

cmake/libraries/pugixml.cmake

@@ -24,9 +24,5 @@ if(PROJECT_ENABLE_PUGIXML)
     )
 
     list(APPEND PROJECT_DEPENDENCIES pugixml_project)
-
-    if (PROJECT_IS_DARWIN)
-      add_dependencies(pugixml_project zlib_project)
-    endif()
   endif()
 endif()

cmake/libraries/rocksdb.cmake

@@ -21,6 +21,7 @@ if(PROJECT_ENABLE_ROCKSDB)
         -DROCKSDB_INSTALL_ON_WINDOWS=ON
         -DWITH_BENCHMARK=OFF
         -DWITH_BENCHMARK_TOOLS=OFF
+        -DWITH_BZ2=OFF
         -DWITH_CORE_TOOLS=OFF
         -DWITH_EXAMPLES=OFF
         -DWITH_GFLAGS=OFF
@@ -33,9 +34,5 @@ if(PROJECT_ENABLE_ROCKSDB)
     )
 
     list(APPEND PROJECT_DEPENDENCIES rocksdb_project)
-
-    if (PROJECT_IS_DARWIN)
-      add_dependencies(rocksdb_project zlib_project)
-    endif()
   endif()
 endif()

cmake/libraries/spdlog.cmake

@@ -22,9 +22,5 @@ if(PROJECT_ENABLE_SPDLOG)
     )
 
     list(APPEND PROJECT_DEPENDENCIES spdlog_project)
-
-    if (PROJECT_IS_DARWIN)
-      add_dependencies(spdlog_project zlib_project)
-    endif()
   endif()
 endif()

cmake/libraries/sqlite.cmake

@@ -25,9 +25,5 @@ if(PROJECT_ENABLE_SQLITE)
     )
 
     list(APPEND PROJECT_DEPENDENCIES sqlite_project)
-
-    if (PROJECT_IS_DARWIN)
-      add_dependencies(sqlite_project zlib_project)
-    endif()
   endif()
 endif()

cmake/libraries/stduuid.cmake

@@ -23,9 +23,5 @@ if(PROJECT_ENABLE_STDUUID)
     )
 
     list(APPEND PROJECT_DEPENDENCIES stduuid_project)
-
-    if (PROJECT_IS_DARWIN)
-      add_dependencies(stduuid_project zlib_project)
-    endif()
   endif()
 endif()

cmake/libraries/testing.cmake

@@ -14,9 +14,5 @@ if (PROJECT_ENABLE_TESTING)
     )
 
     list(APPEND PROJECT_DEPENDENCIES gtest_project)
-
-    if (PROJECT_IS_DARWIN)
-      add_dependencies(gtest_project zlib_project)
-    endif()
   endif()
 endif()

cmake/libraries/zlib.cmake

@@ -1,16 +0,0 @@
-if(PROJECT_IS_DARWIN)
-  if(NOT PROJECT_BUILD)
-    ExternalProject_Add(zlib_project
-      PREFIX external
-      URL ${PROJECT_3RD_PARTY_DIR}/mingw64/zlib-${ZLIB_VERSION}.tar.gz
-      URL_HASH SHA256=${ZLIB_HASH}
-      LIST_SEPARATOR |
-      CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS}
-        -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS}
-        -DBUILD_STATIC_LIBS=ON
-        -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
-    )
-
-    list(APPEND PROJECT_DEPENDENCIES zlib_project)
-  endif()
-endif()