update deps

FISCO-BCOS · Mar 10, 2024 · d7c51fa · d7c51fa
1 parent 60672ca
commit d7c51fa
Show file tree

Hide file tree

Showing 21 changed files with 35 additions and 179 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,6 +42,7 @@
 
 # build
 build
+deps
 
 # scritps
 scripts/ca*

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -58,8 +58,7 @@ hunter_add_package(jsoncpp)
 find_package(jsoncpp CONFIG REQUIRED)
 
 # bcos-utilities
-hunter_add_package(bcos-utilities)
-find_package(bcos-utilities CONFIG REQUIRED)
+include(ProjectBcosUtilities)
 
 include_directories(${CMAKE_INSTALL_INCLUDEDIR})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})

diff --git a/bcos-boostssl/CMakeLists.txt b/bcos-boostssl/CMakeLists.txt
@@ -3,5 +3,5 @@ file(GLOB_RECURSE SRCS "*.cpp")
 file(GLOB_RECURSE HEADERS "*.h")
 
 add_library(${BOOSTSSL_TARGET} ${SRCS} ${HEADERS})
-target_link_libraries(${BOOSTSSL_TARGET} ${UTILITIES_TARGET} Boost::system Boost::filesystem
+target_link_libraries(${BOOSTSSL_TARGET} PUBLIC bcos-utilities Boost::system Boost::filesystem
 Boost::log Boost::chrono Boost::iostreams Boost::thread OpenSSL::SSL OpenSSL::Crypto)
diff --git a/cmake/InstallBcosCryptoDependencies.cmake b/cmake/InstallBcosCryptoDependencies.cmake
diff --git a/cmake/InstallBcosExecutorDependencies.cmake b/cmake/InstallBcosExecutorDependencies.cmake
diff --git a/cmake/InstallBcosFrameworkDependencies.cmake b/cmake/InstallBcosFrameworkDependencies.cmake
diff --git a/cmake/InstallBcosFrontDependencies.cmake b/cmake/InstallBcosFrontDependencies.cmake
diff --git a/cmake/InstallBcosGateWayDependencies.cmake b/cmake/InstallBcosGateWayDependencies.cmake
diff --git a/cmake/InstallBcosGroupManager.cmake b/cmake/InstallBcosGroupManager.cmake
diff --git a/cmake/InstallBcosLedgerDependencies.cmake b/cmake/InstallBcosLedgerDependencies.cmake
diff --git a/cmake/InstallBcosPBFTDependencies.cmake b/cmake/InstallBcosPBFTDependencies.cmake
diff --git a/cmake/InstallBcosRpcDependencies.cmake b/cmake/InstallBcosRpcDependencies.cmake
diff --git a/cmake/InstallBcosScheduler.cmake b/cmake/InstallBcosScheduler.cmake
diff --git a/cmake/InstallBcosStorageDependencies.cmake b/cmake/InstallBcosStorageDependencies.cmake
diff --git a/cmake/InstallBcosSyncDependencies.cmake b/cmake/InstallBcosSyncDependencies.cmake
diff --git a/cmake/InstallBcosTarsProtocolDependencies.cmake b/cmake/InstallBcosTarsProtocolDependencies.cmake
diff --git a/cmake/InstallBcosTxPoolDependencies.cmake b/cmake/InstallBcosTxPoolDependencies.cmake
diff --git a/cmake/InstallBoostSSL.cmake b/cmake/InstallBoostSSL.cmake
@@ -1,5 +1,4 @@
 hunter_add_package(bcos-boostssl)
-find_package(bcos-framework CONFIG REQUIRED)
 hunter_add_package(OpenSSL)
 find_package(OpenSSL REQUIRED)
 find_package(bcos-boostssl CONFIG REQUIRED)
diff --git a/cmake/ProjectBcosUtilities.cmake b/cmake/ProjectBcosUtilities.cmake
@@ -0,0 +1,23 @@
+include(ExternalProject)
+
+ExternalProject_Add(BcosUtilitiesLib
+    PREFIX ${CMAKE_SOURCE_DIR}/deps
+    GIT_REPOSITORY https://github.com/Shareong//bcos-utilities.git
+    GIT_TAG a59f0673386a82c8ed89d88690264e1b02bc7347
+    BUILD_IN_SOURCE 1
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
+    LOG_CONFIGURE 1
+    LOG_BUILD 1
+    LOG_INSTALL 1
+)
+
+ExternalProject_Get_Property(BcosUtilitiesLib INSTALL_DIR)
+add_library(bcos-utilities STATIC IMPORTED)
+set(BCOS_UTILITIES_LIBRARY ${INSTALL_DIR}/lib/libbcos-utilities.a)
+set(BCOS_UTILITIES_INCLUDE_DIR ${INSTALL_DIR}/include)
+file(MAKE_DIRECTORY ${INSTALL_DIR}/lib)  # Must exist.
+file(MAKE_DIRECTORY ${BCOS_UTILITIES_INCLUDE_DIR})  # Must exist.
+set_property(TARGET bcos-utilities PROPERTY IMPORTED_LOCATION ${BCOS_UTILITIES_LIBRARY})
+set_property(TARGET bcos-utilities PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${BCOS_UTILITIES_INCLUDE_DIR})
+add_dependencies(bcos-utilities BcosUtilitiesLib)
+unset(INSTALL_DIR)
diff --git a/cmake/ProjectExecutor.cmake b/cmake/ProjectExecutor.cmake
diff --git a/cmake/config.cmake b/cmake/config.cmake
@@ -1,22 +1,16 @@
 hunter_config(
-    Boost VERSION "1.76.0-local"
-    URL
-    "https://osp-1257653870.cos.ap-guangzhou.myqcloud.com/FISCO-BCOS/FISCO-BCOS/deps/boost_1_76_0.tar.bz2
-    https://downloads.sourceforge.net/project/boost/boost/1.76.0/source/boost_1_76_0.tar.bz2
-    https://nchc.dl.sourceforge.net/project/boost/boost/1.76.0/boost_1_76_0.tar.bz2"
-    SHA1
-    8064156508312dde1d834fec3dca9b11006555b6
-    CMAKE_ARGS
-    CONFIG_MACRO=BOOST_UUID_RANDOM_PROVIDER_FORCE_POSIX
+    Boost VERSION "1.83"
+    URL "https://psychz.dl.sourceforge.net/project/boost/boost/1.83.0/boost_1_83_0.tar.bz2"
+    SHA1 75b1f569134401d178ad2aaf97a2993898dd7ee3
+    CMAKE_ARGS CONFIG_MACRO=BOOST_UUID_RANDOM_PROVIDER_FORCE_POSIX 
 )
 
-hunter_config(bcos-utilities VERSION 1.0.0-rc3-local
-    URL https://${URL_BASE}/FISCO-BCOS/bcos-utilities/archive/632cbeb0412d6ffa3c5217630fe6039f4092f3a4.tar.gz
-	SHA1 37b46cd3174ec1b66e28f19e6e8f31f209b61e4b
-    CMAKE_ARGS HUNTER_PACKAGE_LOG_BUILD=ON HUNTER_PACKAGE_LOG_INSTALL=ON
-)
+# hunter_config(bcos-utilities VERSION 1.0.0
+#     URL https://github.com/Shareong//bcos-utilities/archive/a59f0673386a82c8ed89d88690264e1b02bc7347.tar.gz
+# 	SHA1 7b0ef2ea5c05b7c71b39875cd0df94a5670b0e57
+# )
 
 hunter_config(OpenSSL VERSION tassl_1.1.1b_v1.4-local
     URL https://${URL_BASE}/FISCO-BCOS/TASSL-1.1.1b/archive/f9d60fa510e5fbe24413b4abdf1ea3a48f9ee6aa.tar.gz
     SHA1 e56121278bf07587d58d154b4615f96575957d6f
-)
+)
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,6 +42,7 @@ @@
     # build
     build
+    deps
     # scritps
     scripts/ca*
@@ Expand Down @@