bitcoin system fixes
All checks were successful
sgraves/cpp-build-system_msys2/pipeline/head This commit looks good
sgraves/cpp-build-system/pipeline/head This commit looks good
sgraves/cpp-build-system_mac/pipeline/head This commit looks good

This commit is contained in:
2025-12-15 10:51:17 -06:00
parent 6b8c787688
commit fe71b0169b
4 changed files with 12 additions and 3 deletions

View File

@@ -15,6 +15,7 @@ clsid_shelllink
cmake_current_source_dir cmake_current_source_dir
cmake_host_win32 cmake_host_win32
comdlg32 comdlg32
constexpr
cpp_httplib_hash cpp_httplib_hash
cppcoreguidelines cppcoreguidelines
cppdbg cppdbg

View File

@@ -48,6 +48,10 @@ list(APPEND PROJECT_CXXFLAGS_LIST
-Wunused -Wunused
) )
if (PROJECT_ENABLE_LIBBITCOIN_SYSTEM AND PROJECT_IS_DARWIN)
list(APPEND PROJECT_CXXFLAGS_LIST -Wno-enum-constexpr-conversion)
endif()
if (NOT PROJECT_IS_DARWIN) if (NOT PROJECT_IS_DARWIN)
list(APPEND PROJECT_CXXFLAGS_LIST list(APPEND PROJECT_CXXFLAGS_LIST
-Wduplicated-branches -Wduplicated-branches

View File

@@ -95,7 +95,7 @@ if(PROJECT_ENABLE_BOOST)
endif() endif()
if(PROJECT_ENABLE_LIBBITCOIN_SYSTEM) if(PROJECT_ENABLE_LIBBITCOIN_SYSTEM)
set(BOOST_CXX_STANDARD 20) set(BOOST_CXX_STANDARD 14)
else() else()
set(BOOST_CXX_STANDARD ${CMAKE_CXX_STANDARD}) set(BOOST_CXX_STANDARD ${CMAKE_CXX_STANDARD})
endif() endif()
@@ -106,12 +106,11 @@ if(PROJECT_ENABLE_BOOST)
address-model=64 address-model=64
architecture=${BOOST_ARCH} architecture=${BOOST_ARCH}
cxxstd-dialect=gnu cxxstd-dialect=gnu
cxxflags=-std=gnu++${BOOST_CXX_STANDARD}
cxxstd=${BOOST_CXX_STANDARD} cxxstd=${BOOST_CXX_STANDARD}
cxxflags=-Wno-enum-constexpr-conversion
define=BOOST_ASIO_HAS_STD_STRING_VIEW define=BOOST_ASIO_HAS_STD_STRING_VIEW
define=BOOST_SYSTEM_NO_DEPRECATED define=BOOST_SYSTEM_NO_DEPRECATED
link=${BOOST_LINK} link=${BOOST_LINK}
linkflags=-std=gnu++${BOOST_CXX_STANDARD}
threading=multi threading=multi
variant=${BOOST_BUILD_TYPE_LOWER} variant=${BOOST_BUILD_TYPE_LOWER}
) )

View File

@@ -323,6 +323,11 @@ using vlc_string_t = std::unique_ptr<char, vlc_string_deleter>;
#if defined(__cplusplus) #if defined(__cplusplus)
#if defined(PROJECT_ENABLE_BOOST) #if defined(PROJECT_ENABLE_BOOST)
#if defined(PROJECT_ENABLE_LIBBITCOIN_SYSTEM) && defined(PROJECT_IS_DARWIN)
#define BOOST_ASIO_HAS_STD_INVOKE_RESULT
#define BOOST_NO_CXX98_FUNCTION_BASE
#endif // defined(PROJECT_ENABLE_LIBBITCOIN_SYSTEM) &&
// defined(PROJECT_IS_DARWIN)
#include "boost/archive/text_iarchive.hpp" #include "boost/archive/text_iarchive.hpp"
#include "boost/archive/text_oarchive.hpp" #include "boost/archive/text_oarchive.hpp"
#include "boost/asio.hpp" #include "boost/asio.hpp"