From 5843cb6c653a65eab3aea5956b41150b7c94cb0a Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto Date: Mon, 18 Nov 2024 10:57:37 -0500 Subject: [PATCH 16/17] include locale only when targeting WIN32 --- CMakeLists.txt | 5 ++++- src/wallet/api/wallet.cpp | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 763d240fc..1397bb217 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1100,7 +1100,10 @@ if(STATIC) set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_STATIC_RUNTIME ON) endif() -find_package(Boost 1.58 QUIET REQUIRED COMPONENTS system filesystem thread date_time chrono regex serialization program_options locale) +if(WIN32) + set(BOOST_LOCALE locale) +endif() +find_package(Boost 1.58 QUIET REQUIRED COMPONENTS system filesystem thread date_time chrono regex serialization program_options ${BOOST_LOCALE}) add_definitions(-DBOOST_ASIO_ENABLE_SEQUENTIAL_STRAND_ALLOCATION) add_definitions(-DBOOST_NO_AUTO_PTR) add_definitions(-DBOOST_UUID_DISABLE_ALIGNMENT) # This restores UUID's std::has_unique_object_representations property diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp index 685432597..c9ff4b860 100644 --- a/src/wallet/api/wallet.cpp +++ b/src/wallet/api/wallet.cpp @@ -46,7 +46,9 @@ #include #include +#ifdef WIN32 #include +#endif #include #include "bc-ur/src/bc-ur.hpp" #ifdef HIDAPI_DUMMY -- 2.39.5 (Apple Git-154)