v2.1.0-rc (#63)

Reviewed-on: #63

cmake/libraries/boost.cmake

@@ -39,6 +39,14 @@ if(PROJECT_ENABLE_BOOST)
           wserialization
       )
     else()
+      if(PROJECT_IS_DARWIN)
+        set(CMAKE_HAVE_THREADS_LIBRARY 1)
+        set(CMAKE_THREAD_LIBS_INIT "-lpthread")
+        set(CMAKE_USE_PTHREADS_INIT 1)
+        set(CMAKE_USE_WIN32_THREADS_INIT 0)
+        set(THREADS_PREFER_PTHREAD_FLAG ON)
+      endif()
+
       find_package(Boost ${BOOST_MAJOR_VERSION}.${BOOST_MINOR_VERSION}.${BOOST_PATCH_VERSION}
         REQUIRED
         COMPONENTS
@@ -54,7 +62,6 @@ if(PROJECT_ENABLE_BOOST)
           random
           regex
           serialization
-          system
           thread
           wserialization
       )
@@ -120,10 +127,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
@@ -131,6 +140,10 @@ if(PROJECT_ENABLE_BOOST)
 
       list(APPEND PROJECT_DEPENDENCIES boost_project)
 
+     if(PROJECT_IS_DARWIN OR PROJECT_REQUIRE_ALPINE)
+        add_dependencies(boost_project icu_project)
+      endif()
+
       if (NOT CMAKE_HOST_WIN32)
         add_dependencies(boost_project openssl_project)
       endif()

cmake/libraries/cpp_httplib.cmake

@@ -15,6 +15,7 @@ if(PROJECT_ENABLE_CPP_HTTPLIB)
       CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS}
         -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS}
         -DBUILD_STATIC_LIBS=ON
+        -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
         -DHTTPLIB_REQUIRE_BROTLI=OFF
         -DHTTPLIB_REQUIRE_OPENSSL=ON
         -DHTTPLIB_REQUIRE_ZLIB=ON

cmake/libraries/curl.cmake

@@ -27,8 +27,8 @@ if(PROJECT_ENABLE_CURL)
         -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS}
         -DBUILD_STATIC_CURL=ON
         -DBUILD_STATIC_LIBS=ON
-        -DBUILD_STATIC_LIBS=ON
         -DBUILD_TESTING=OFF
+        -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
         -DCURL_BROTLI=OFF
         -DCURL_CA_BUNDLE=./cacert.pem
         -DCURL_CA_FALLBACK=ON
@@ -37,11 +37,13 @@ if(PROJECT_ENABLE_CURL)
         -DCURL_USE_LIBSSH2=OFF
         -DCURL_USE_OPENSSL=${PROJECT_ENABLE_OPENSSL}
         -DCURL_ZLIB=ON
+        -DCURL_ZSTD=OFF
         -DENABLE_CURL_MANUAL=OFF
         -DENABLE_THREADED_RESOLVER=ON
         -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR}
         -DOPENSSL_USE_STATIC_LIBS=${OPENSSL_USE_STATIC_LIBS}
         -DUSE_LIBIDN2=OFF
+        -DUSE_NGHTTP2=OFF
         -DZLIB_USE_STATIC_LIBS=${ZLIB_USE_STATIC_LIBS}
     )
 

cmake/libraries/fuse.cmake

@@ -20,17 +20,25 @@ if(PROJECT_ENABLE_FUSE AND NOT PROJECT_IS_MINGW)
       endif()
     endif()
   else()
-    pkg_check_modules(LIBFUSE3 fuse3>=3.0.0)
-    if(LIBFUSE3_FOUND)
-      set(PROJECT_FUSE fuse3)
-      set(PROJECT_FUSE_INCLUDE_DIRS ${LIBFUSE3_INCLUDE_DIRS})
+    if (PROJECT_IS_DARWIN)
+      find_library(OSXFUSE NO_CACHE NAMES OSXFUSE)
+      if (NOT OSXFUSE)
+        message(FATAL_ERROR "FUSE for macOS not found (https://macfuse.github.io)")
+      endif ()
+      set(PROJECT_FUSE fuse2)
     else()
-      pkg_check_modules(LIBFUSE2 fuse>=2.9.0)
-      if(LIBFUSE2_FOUND)
-        set(PROJECT_FUSE fuse2)
-        set(PROJECT_FUSE_INCLUDE_DIRS ${LIBFUSE2_INCLUDE_DIRS})
+      pkg_check_modules(LIBFUSE3 fuse3>=3.0.0)
+      if(LIBFUSE3_FOUND)
+        set(PROJECT_FUSE fuse3)
+        set(PROJECT_FUSE_INCLUDE_DIRS ${LIBFUSE3_INCLUDE_DIRS})
       else()
-        message(FATAL_ERROR "fuse library not found")
+        pkg_check_modules(LIBFUSE2 fuse>=2.9.0)
+        if(LIBFUSE2_FOUND)
+          set(PROJECT_FUSE fuse2)
+          set(PROJECT_FUSE_INCLUDE_DIRS ${LIBFUSE2_INCLUDE_DIRS})
+        else()
+          message(FATAL_ERROR "fuse library not found")
+        endif()
       endif()
     endif()
   endif()

cmake/libraries/icu.cmake

@@ -0,0 +1,24 @@
+if((PROJECT_IS_DARWIN OR PROJECT_REQUIRE_ALPINE) AND NOT PROJECT_IS_MINGW AND NOT PROJECT_BUILD)
+  if(PROJECT_BUILD_SHARED_LIBS)
+    set(ICU_ENABLE_SHARED yes)
+  else()
+    set(ICU_ENABLE_SHARED no)
+  endif()
+
+  ExternalProject_Add(icu_project
+    PREFIX external
+    URL ${PROJECT_3RD_PARTY_DIR}/mingw64/icu-release-${ICU_VERSION}.tar.gz
+    URL_HASH SHA256=${ICU_HASH}
+    BUILD_IN_SOURCE 1
+    LIST_SEPARATOR |
+    PATCH_COMMAND chmod +x ${PROJECT_3RD_PARTY_DIR}/icu_configure.sh
+    CONFIGURE_COMMAND cd icu4c/source && ${PROJECT_3RD_PARTY_DIR}/icu_configure.sh
+      ${PROJECT_MARCH}
+      ${PROJECT_EXTERNAL_BUILD_ROOT}
+      ${ICU_ENABLE_SHARED}
+    BUILD_COMMAND cd icu4c/source && make -j$ENV{CMAKE_BUILD_PARALLEL_LEVEL}
+    INSTALL_COMMAND cd icu4c/source && make install
+  )
+
+  list(APPEND PROJECT_DEPENDENCIES icu_project)
+endif()

cmake/libraries/json.cmake

@@ -18,6 +18,7 @@ if(PROJECT_ENABLE_JSON)
       CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS}
         -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS}
         -DBUILD_STATIC_LIBS=ON
+        -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
         -DJSON_BuildTests=OFF
         -DJSON_Install=ON
         -DJSON_MultipleHeaders=OFF

cmake/libraries/openssl.cmake

@@ -15,6 +15,12 @@ if(PROJECT_ENABLE_OPENSSL)
   elseif(NOT PROJECT_IS_MINGW)
     if(PROJECT_IS_MINGW)
       set(OPENSSL_COMPILE_TYPE mingw64)
+    elseif(PROJECT_IS_DARWIN)
+      if(PROJECT_IS_ARM64)
+        set(OPENSSL_COMPILE_TYPE darwin64-arm64)
+      else()
+        set(OPENSSL_COMPILE_TYPE darwin64-x86_64)
+      endif()
     elseif(PROJECT_IS_ARM64)
       set(OPENSSL_COMPILE_TYPE linux-aarch64)
     else()

cmake/libraries/pugixml.cmake

@@ -20,6 +20,7 @@ if(PROJECT_ENABLE_PUGIXML)
       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 pugixml_project)

cmake/libraries/rocksdb.cmake

@@ -14,12 +14,14 @@ if(PROJECT_ENABLE_ROCKSDB)
       CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS}
         -DBUILD_SHARED_LIBS=OFF
         -DBUILD_STATIC_LIBS=ON
+        -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
         -DFAIL_ON_WARNINGS=OFF
         -DPORTABLE=1
         -DROCKSDB_BUILD_SHARED=OFF
         -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

cmake/libraries/spdlog.cmake

@@ -15,6 +15,7 @@ if(PROJECT_ENABLE_SPDLOG)
       LIST_SEPARATOR |
       CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS}
         -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS}
+        -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
         -DSPDLOG_BUILD_EXAMPLE=OFF
         -DSPDLOG_FMT_EXTERNAL=OFF
         -DSPDLOG_FMT_EXTERNAL_HO=OFF

cmake/libraries/stduuid.cmake

@@ -16,6 +16,7 @@ if(PROJECT_ENABLE_STDUUID)
       CMAKE_ARGS ${PROJECT_EXTERNAL_CMAKE_FLAGS}
         -DBUILD_SHARED_LIBS=${PROJECT_BUILD_SHARED_LIBS}
         -DBUILD_STATIC_LIBS=ON
+        -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
         -DUUID_BUILD_TESTS=OFF
         -DUUID_ENABLE_INSTALL=ON
         -DUUID_USING_CXX20_SPAN=ON

cmake/libraries/testing.cmake

@@ -10,6 +10,7 @@ if (PROJECT_ENABLE_TESTING)
       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 gtest_project)