diff options
Diffstat (limited to 'patches/wownero/0015-include-locale-only-when-targeting-WIN32.patch')
| -rw-r--r-- | patches/wownero/0015-include-locale-only-when-targeting-WIN32.patch | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/patches/wownero/0015-include-locale-only-when-targeting-WIN32.patch b/patches/wownero/0015-include-locale-only-when-targeting-WIN32.patch index 512e012..27ec9bc 100644 --- a/patches/wownero/0015-include-locale-only-when-targeting-WIN32.patch +++ b/patches/wownero/0015-include-locale-only-when-targeting-WIN32.patch @@ -1,4 +1,4 @@ -From a6538084be4fdfbf84e7cbae2bce040aeaf4a4f9 Mon Sep 17 00:00:00 2001 +From eeb059ab8bff7e8614531565259ca66f6e6a8c7d Mon Sep 17 00:00:00 2001 From: Czarek Nakamoto <cyjan@mrcyjanek.net> Date: Mon, 18 Nov 2024 10:57:37 -0500 Subject: [PATCH 15/15] include locale only when targeting WIN32 @@ -9,21 +9,21 @@ Subject: [PATCH 15/15] include locale only when targeting WIN32 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index e3a0faacd..b9207ef2a 100644 +index b8782570d..d1ed1de7b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1096,7 +1096,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 +@@ -1090,7 +1090,10 @@ if(NOT Boost_FOUND) + elseif(Boost_FOUND) + message(STATUS "Found Boost Version: ${Boost_VERSION_STRING}") + +- set(BOOST_COMPONENTS filesystem thread date_time chrono serialization program_options locale) ++ if(WIN32) ++ set(BOOST_LOCALE locale) ++ endif() ++ set(BOOST_COMPONENTS filesystem thread date_time chrono serialization program_options ${BOOST_LOCALE}) + + # Boost System is header-only since 1.69 + if (Boost_VERSION_STRING VERSION_LESS 1.69.0) diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp index e650e6044..6d7553a1d 100644 --- a/src/wallet/api/wallet.cpp @@ -39,5 +39,5 @@ index e650e6044..6d7553a1d 100644 #include "bc-ur/src/bc-ur.hpp" #if defined(HIDAPI_DUMMY) && !defined(HAVE_HIDAPI) -- -2.39.5 (Apple Git-154) +2.48.0 |