From b1bc7f1f71da2520c37a6cc1b47e4213f16c7e93 Mon Sep 17 00:00:00 2001 From: kamilsa Date: Wed, 5 Jun 2024 13:42:40 +0500 Subject: [PATCH] Update boost, rocksdb, spdlog (#139) * Update boost to 1.85 Signed-off-by: kamilsa * Update rocksdb to 9.2.1 Signed-off-by: kamilsa * Update spdlog --------- Signed-off-by: kamilsa Co-authored-by: Harrm --- cmake/configs/default.cmake | 6 +++--- cmake/projects/Boost/hunter.cmake | 11 ++++++++++ cmake/projects/rocksdb/hunter.cmake | 7 ++++++ cmake/projects/spdlog/hunter.cmake | 33 +++++++++++++++++++++++++++-- 4 files changed, 52 insertions(+), 5 deletions(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index f013ec782d..a2d5961d33 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -37,7 +37,7 @@ if(MINGW) # https://github.com/boostorg/build/issues/301 hunter_default_version(Boost VERSION 1.64.0) else() - hunter_default_version(Boost VERSION 1.84.0) + hunter_default_version(Boost VERSION 1.85.0) endif() hunter_default_version(Boost.DI VERSION 1.1.0-p1) @@ -456,7 +456,7 @@ hunter_default_version(re2 VERSION 2017.11.01-p0) hunter_default_version(readline VERSION 6.3) hunter_default_version(recastnavigation VERSION 1.4-p0) hunter_default_version(renderproto VERSION 0.11.1) -hunter_default_version(rocksdb VERSION 9.0.0) +hunter_default_version(rocksdb VERSION 9.2.1) hunter_default_version(ros VERSION 1.14.6-p0) hunter_default_version(ros_comm VERSION 1.14.3-p1) hunter_default_version(ros_comm_msgs VERSION 1.11.2-p0) @@ -494,7 +494,7 @@ if(MSVC_VERSION LESS 1800) # for VS12 - version without support C++11 hunter_default_version(spdlog VERSION 1.0.0-p0) else() - hunter_default_version(spdlog VERSION 1.4.2-p0) + hunter_default_version(spdlog VERSION 1.12.0-p0) endif() hunter_default_version(spirv-cross VERSION 20190906) diff --git a/cmake/projects/Boost/hunter.cmake b/cmake/projects/Boost/hunter.cmake index 0ac0351bb4..5d5d2b3edb 100644 --- a/cmake/projects/Boost/hunter.cmake +++ b/cmake/projects/Boost/hunter.cmake @@ -214,6 +214,17 @@ hunter_add_version( d55f2e1ca02f99a8a91d334efc480384f3e3dfdd ) +hunter_add_version( + PACKAGE_NAME + Boost + VERSION + "1.85.0" + URL + "https://boostorg.jfrog.io/artifactory/main/release/1.85.0/source/boost_1_85_0.tar.gz" + SHA1 + 509db0247aebdc15e835303ec9628b8493bc2449 +) + # up until 1.63 sourcefourge was used set(_hunter_boost_base_url "https://downloads.sourceforge.net/project/boost/boost/") hunter_add_version( diff --git a/cmake/projects/rocksdb/hunter.cmake b/cmake/projects/rocksdb/hunter.cmake index 6600d4ba76..e54fcb5bcf 100644 --- a/cmake/projects/rocksdb/hunter.cmake +++ b/cmake/projects/rocksdb/hunter.cmake @@ -49,6 +49,13 @@ hunter_add_version( SHA1 "82d6749a1fa1d638d4dba9c884ea9c2c48a49d3a" ) +hunter_add_version( + PACKAGE_NAME rocksdb + VERSION 9.2.1 + URL "https://github.com/facebook/rocksdb/archive/refs/tags/v9.2.1.tar.gz" + SHA1 "9d45e554161d569354382f05391b65576b662e5a" +) + if(MSVC) hunter_cmake_args(rocksdb CMAKE_ARGS diff --git a/cmake/projects/spdlog/hunter.cmake b/cmake/projects/spdlog/hunter.cmake index a9178f2fd2..fc726947bb 100644 --- a/cmake/projects/spdlog/hunter.cmake +++ b/cmake/projects/spdlog/hunter.cmake @@ -119,6 +119,35 @@ hunter_add_version( 5dd633311d1aec79404d6694b452745b80f1a7d1 ) +hunter_add_version( + PACKAGE_NAME + spdlog + VERSION + "1.8.0-p1" + URL + "https://github.com/cpp-pm/spdlog/archive/v1.8.0-p1.tar.gz" + SHA1 + 3bfb2352482e6190c377f121b1f760dad767b58d +) + +hunter_add_version( + PACKAGE_NAME spdlog + VERSION "1.9.2-p0" + URL "https://github.com/cpp-pm/spdlog/archive/v1.9.2-p0.tar.gz" + SHA1 f3219fb548667857f95d20714a2c85a4ae41049b +) + +hunter_add_version( + PACKAGE_NAME + spdlog + VERSION + "1.12.0-p0" + URL + "https://github.com/cpp-pm/spdlog/archive/v1.12.0-p0.tar.gz" + SHA1 + ed377f84e2c14e8532ee85aa55656852bf29cc43 +) + hunter_cmake_args( spdlog CMAKE_ARGS @@ -128,9 +157,9 @@ hunter_cmake_args( SPDLOG_BUILD_TESTING=OFF SPDLOG_BUILD_TESTS=OFF SPDLOG_BUILD_BENCH=OFF - SPDLOG_FMT_EXTERNAL=NO + SPDLOG_FMT_EXTERNAL=ON ) hunter_pick_scheme(DEFAULT url_sha1_cmake) hunter_cacheable(spdlog) -hunter_download(PACKAGE_NAME spdlog) +hunter_download(PACKAGE_NAME spdlog) \ No newline at end of file