From 1ae2d7c0167a437310d2751a974562bf101094af Mon Sep 17 00:00:00 2001 From: kyonRay Date: Thu, 14 Dec 2023 00:16:46 +0800 Subject: [PATCH] (build): fix boost uuid exception. --- CMakeLists.txt | 3 +++ test/testTransaction.cpp | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cba6832f8..c4a7415c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,6 +33,9 @@ if (WIN32) add_definitions(-D_WIN32_WINNT=0x0601) add_definitions(-DBOOST_USE_WINAPI_VERSION=BOOST_WINAPI_VERSION_WIN7) set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS "ON") +else () + add_definitions(-DBOOST_UUID_RANDOM_PROVIDER_FORCE_POSIX=1) + add_definitions(-DBOOST_UUID_RANDOM_PROVIDER_SHOW=1) endif () set(JAVA_SDK_JNI_CMAKE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake" CACHE PATH "The cmake path for the library") diff --git a/test/testTransaction.cpp b/test/testTransaction.cpp index 45a553608..d6eadc6f9 100644 --- a/test/testTransaction.cpp +++ b/test/testTransaction.cpp @@ -26,6 +26,7 @@ #include #include #include +#include using namespace bcos; @@ -34,7 +35,11 @@ struct TestTxFixture }; BOOST_FIXTURE_TEST_SUITE(TransactionTest, TestTxFixture) - +#if defined(BOOST_UUID_RANDOM_PROVIDER_SHOW) +#define PRINT_MACRO_HELPER(x) #x +#define PRINT_MACRO(x) #x"=" PRINT_MACRO_HELPER(x) +#pragma message(PRINT_MACRO(BOOST_UUID_RANDOM_PROVIDER_NAME)) +#endif const char* g_hw_abi = "[{\"inputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[]," "\"name\":\"get\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}]"