boost fix

This commit is contained in:
2026-01-25 17:35:14 -06:00
parent 7ef0fb6f60
commit d31c429b33

View File

@@ -1,10 +1,10 @@
# /usr/sbin/softwareupdate --install-rosetta --agree-to-license
if(PROJECT_ENABLE_BOOST)
if(PROJECT_ENABLE_LIBBITCOIN_SYSTEM)
set(BOOST_MAJOR_VERSION ${BOOST2_MAJOR_VERSION})
set(BOOST_MINOR_VERSION ${BOOST2_MINOR_VERSION})
set(BOOST_PATCH_VERSION ${BOOST2_PATCH_VERSION})
endif()
set(BOOST_ROOT ${PROJECT_EXTERNAL_BUILD_ROOT})
set(BOOST_INCLUDE_DIR ${BOOST_ROOT}/include/boost-${BOOST_MINOR_VERSION}_${BOOST_MINOR_VERSION})
@@ -96,9 +96,17 @@ if(PROJECT_ENABLE_BOOST)
if(PROJECT_ENABLE_LIBBITCOIN_SYSTEM)
set(BOOST_CXX_STANDARD 17)
set(BOOST_OPTIONS cxxflags=-Wno-enum-constexpr-conversion)
if (PROJECT_IS_DARWIN)
set(BOOST_OPTIONS ${BOOST_OPTIONS} define=BOOST_NO_CXX98_FUNCTION_BASE)
if(PROJECT_IS_ARM64)
set(BOOST_CXX_FLAGS "-arch arm64 -Wno-enum-constexpr-conversion")
set(BOOST_C_FLAGS "-arch arm64")
set(BOOST_LINK_FLAGS "-arch arm64")
else()
set(BOOST_CXX_FLAGS "-arch x86_64 -Wno-enum-constexpr-conversion")
set(BOOST_C_FLAGS "-arch x86_64")
set(BOOST_LINK_FLAGS "-arch x86_64")
endif()
set(BOOST_OPTIONS ${BOOST_OPTIONS} toolset=clang define=BOOST_NO_CXX98_FUNCTION_BASE)
endif()
else()
set(BOOST_CXX_STANDARD ${CMAKE_CXX_STANDARD})
@@ -118,8 +126,11 @@ if(PROJECT_ENABLE_BOOST)
address-model=64
architecture=${BOOST_ARCH}
cxxstd=${BOOST_CXX_STANDARD}
cxxflags=${BOOST_CXX_FLAGS}
cflags=${BOOST_C_FLAGS}
define=BOOST_SYSTEM_NO_DEPRECATED
link=${BOOST_LINK}
linkflags=${BOOST_LINK_FLAGS}
threading=multi
variant=${BOOST_BUILD_TYPE_LOWER}
${BOOST_OPTIONS}