Merge remote-tracking branch 'ripple/develop' into develop

2025-12-06 17:27:52 +00:00 · 2022-05-20 08:05:08 +00:00
parent 37da7b23f3 25474343a9
commit 4244a5a245
304 changed files with 21096 additions and 7004 deletions
--- a/Builds/CMake/deps/Libarchive.cmake
+++ b/Builds/CMake/deps/Libarchive.cmake
@@ -125,7 +125,7 @@ if (local_libarchive)
      --build .
      --config $<CONFIG>
      --target archive_static
-      $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},3.12>:--parallel ${ep_procs}>
+      --parallel ${ep_procs}
      $<$<BOOL:${is_multiconfig}>:
        COMMAND
          ${CMAKE_COMMAND} -E copy
--- a/Builds/CMake/deps/Lz4.cmake
+++ b/Builds/CMake/deps/Lz4.cmake
@@ -43,7 +43,7 @@ else()
      --build .
      --config $<CONFIG>
      --target lz4_static
-      $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},3.12>:--parallel ${ep_procs}>
+      --parallel ${ep_procs}
      $<$<BOOL:${is_multiconfig}>:
        COMMAND
          ${CMAKE_COMMAND} -E copy
--- a/Builds/CMake/deps/Nudb.cmake
+++ b/Builds/CMake/deps/Nudb.cmake
@@ -8,35 +8,19 @@

 if (is_root_project) # NuDB not needed in the case of xrpl_core inclusion build
  add_library (nudb INTERFACE)
-  if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.11)
-    FetchContent_Declare(
-      nudb_src
-      GIT_REPOSITORY https://github.com/CPPAlliance/NuDB.git
-      GIT_TAG        2.0.5
-    )
-    FetchContent_GetProperties(nudb_src)
-    if(NOT nudb_src_POPULATED)
-      message (STATUS "Pausing to download NuDB...")
-      FetchContent_Populate(nudb_src)
-    endif()
-  else ()
-    ExternalProject_Add (nudb_src
-      PREFIX ${nih_cache_path}
-      GIT_REPOSITORY https://github.com/CPPAlliance/NuDB.git
-      GIT_TAG 2.0.5
-      CONFIGURE_COMMAND ""
-      BUILD_COMMAND ""
-      TEST_COMMAND ""
-      INSTALL_COMMAND ""
-    )
-    ExternalProject_Get_Property (nudb_src SOURCE_DIR)
-    set (nudb_src_SOURCE_DIR "${SOURCE_DIR}")
-    file (MAKE_DIRECTORY ${nudb_src_SOURCE_DIR}/include)
-    add_dependencies (nudb nudb_src)
-  endif ()
+  FetchContent_Declare(
+    nudb_src
+    GIT_REPOSITORY https://github.com/CPPAlliance/NuDB.git
+    GIT_TAG        2.0.5
+  )
+  FetchContent_GetProperties(nudb_src)
+  if(NOT nudb_src_POPULATED)
+    message (STATUS "Pausing to download NuDB...")
+    FetchContent_Populate(nudb_src)
+  endif()

  file(TO_CMAKE_PATH "${nudb_src_SOURCE_DIR}" nudb_src_SOURCE_DIR)
-# specify as system includes so as to avoid warnings
+  # specify as system includes so as to avoid warnings
  target_include_directories (nudb SYSTEM INTERFACE ${nudb_src_SOURCE_DIR}/include)
  target_link_libraries (nudb
    INTERFACE
--- a/Builds/CMake/deps/Protobuf.cmake
+++ b/Builds/CMake/deps/Protobuf.cmake
@@ -65,7 +65,7 @@ if (local_protobuf OR NOT (Protobuf_FOUND AND Protobuf_PROTOC_EXECUTABLE AND pro
      ${CMAKE_COMMAND}
      --build .
      --config $<CONFIG>
-      $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},3.12>:--parallel ${ep_procs}>
+      --parallel ${ep_procs}
    TEST_COMMAND ""
    INSTALL_COMMAND
      ${CMAKE_COMMAND} -E env --unset=DESTDIR ${CMAKE_COMMAND} --build . --config $<CONFIG> --target install
--- a/Builds/CMake/deps/Rocksdb.cmake
+++ b/Builds/CMake/deps/Rocksdb.cmake
@@ -136,7 +136,7 @@ if (local_rocksdb)
      ${CMAKE_COMMAND}
      --build .
      --config $<CONFIG>
-      $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},3.12>:--parallel ${ep_procs}>
+      --parallel ${ep_procs}
      $<$<BOOL:${is_multiconfig}>:
        COMMAND
          ${CMAKE_COMMAND} -E copy
--- a/Builds/CMake/deps/Snappy.cmake
+++ b/Builds/CMake/deps/Snappy.cmake
@@ -42,7 +42,7 @@ else()
      ${CMAKE_COMMAND}
      --build .
      --config $<CONFIG>
-      $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},3.12>:--parallel ${ep_procs}>
+      --parallel ${ep_procs}
      $<$<BOOL:${is_multiconfig}>:
        COMMAND
          ${CMAKE_COMMAND} -E copy
--- a/Builds/CMake/deps/Soci.cmake
+++ b/Builds/CMake/deps/Soci.cmake
@@ -113,7 +113,7 @@ else()
      ${CMAKE_COMMAND}
      --build .
      --config $<CONFIG>
-      $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},3.12>:--parallel ${ep_procs}>
+      --parallel ${ep_procs}
      $<$<BOOL:${is_multiconfig}>:
        COMMAND
          ${CMAKE_COMMAND} -E copy
--- a/Builds/CMake/deps/Sqlite.cmake
+++ b/Builds/CMake/deps/Sqlite.cmake
@@ -56,7 +56,7 @@ else()
      ${CMAKE_COMMAND}
      --build .
      --config $<CONFIG>
-      $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},3.12>:--parallel ${ep_procs}>
+      --parallel ${ep_procs}
      $<$<BOOL:${is_multiconfig}>:
        COMMAND
          ${CMAKE_COMMAND} -E copy
--- a/Builds/CMake/deps/cassandra.cmake
+++ b/Builds/CMake/deps/cassandra.cmake
@@ -112,6 +112,8 @@ if(reporting)
            -DLIBUV_LIBARY=${BINARY_DIR}/libuv_a.a
            -DLIBUV_INCLUDE_DIR=${SOURCE_DIR}/include
            -DCASS_BUILD_STATIC=ON
+            -DCASS_BUILD_SHARED=OFF
+            -DOPENSSL_ROOT_DIR=/opt/local/openssl
            INSTALL_COMMAND ""
            BUILD_BYPRODUCTS <BINARY_DIR>/${ep_lib_prefix}cassandra_static.a
            LOG_BUILD TRUE
--- a/Builds/CMake/deps/date.cmake
+++ b/Builds/CMake/deps/date.cmake
@@ -9,41 +9,10 @@

 find_package (date QUIET)
 if (NOT TARGET date::date)
-  if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.14)
-    FetchContent_Declare(
-      hh_date_src
-      GIT_REPOSITORY https://github.com/HowardHinnant/date.git
-      GIT_TAG        fc4cf092f9674f2670fb9177edcdee870399b829
-    )
-    FetchContent_MakeAvailable(hh_date_src)
-  else ()
-    ExternalProject_Add (hh_date_src
-      PREFIX ${nih_cache_path}
-      GIT_REPOSITORY https://github.com/HowardHinnant/date.git
-      GIT_TAG        fc4cf092f9674f2670fb9177edcdee870399b829
-      CONFIGURE_COMMAND ""
-      BUILD_COMMAND ""
-      TEST_COMMAND ""
-      INSTALL_COMMAND ""
-    )
-    ExternalProject_Get_Property (hh_date_src SOURCE_DIR)
-    set (hh_date_src_SOURCE_DIR "${SOURCE_DIR}")
-    file (MAKE_DIRECTORY ${hh_date_src_SOURCE_DIR}/include)
-    add_library (date_interface INTERFACE)
-    add_library (date::date ALIAS date_interface)
-    add_dependencies (date_interface hh_date_src)
-    file (TO_CMAKE_PATH "${hh_date_src_SOURCE_DIR}" hh_date_src_SOURCE_DIR)
-    target_include_directories (date_interface
-      SYSTEM INTERFACE
-          $<BUILD_INTERFACE:${hh_date_src_SOURCE_DIR}/include>
-          $<INSTALL_INTERFACE:include>)
-    install (
-      FILES
-        ${hh_date_src_SOURCE_DIR}/include/date/date.h
-      DESTINATION include/date)
-    install (TARGETS date_interface
-      EXPORT RippleExports
-      INCLUDES DESTINATION include)
-  endif ()
+  FetchContent_Declare(
+    hh_date_src
+    GIT_REPOSITORY https://github.com/HowardHinnant/date.git
+    GIT_TAG        fc4cf092f9674f2670fb9177edcdee870399b829
+  )
+  FetchContent_MakeAvailable(hh_date_src)
 endif ()
-
--- a/Builds/CMake/deps/gRPC.cmake
+++ b/Builds/CMake/deps/gRPC.cmake
@@ -112,7 +112,7 @@ else ()
        ${CMAKE_COMMAND}
          --build .
          --config $<CONFIG>
-          $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},3.12>:--parallel ${ep_procs}>
+          --parallel ${ep_procs}
      TEST_COMMAND ""
      INSTALL_COMMAND
        ${CMAKE_COMMAND} -E env --unset=DESTDIR ${CMAKE_COMMAND} --build . --config $<CONFIG> --target install
@@ -169,7 +169,7 @@ else ()
          ${CMAKE_COMMAND}
            --build .
            --config $<CONFIG>
-            $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},3.12>:--parallel ${ep_procs}>
+            --parallel ${ep_procs}
        TEST_COMMAND ""
        INSTALL_COMMAND
          ${CMAKE_COMMAND} -E env --unset=DESTDIR ${CMAKE_COMMAND} --build . --config $<CONFIG> --target install
@@ -237,7 +237,7 @@ else ()
        ${CMAKE_COMMAND}
        --build .
        --config $<CONFIG>
-        $<$<VERSION_GREATER_EQUAL:${CMAKE_VERSION},3.12>:--parallel ${ep_procs}>
+        --parallel ${ep_procs}
        $<$<BOOL:${is_multiconfig}>:
          COMMAND
            ${CMAKE_COMMAND} -E copy