updated build system
All checks were successful
BlockStorage/repertory/pipeline/head This commit looks good

This commit is contained in:
2026-02-06 17:12:48 -06:00
parent 54447e4105
commit d93c94d845
92 changed files with 136 additions and 115 deletions

View File

@@ -1,3 +1,4 @@
# /usr/sbin/softwareupdate --install-rosetta --agree-to-license
if(PROJECT_ENABLE_BOOST)
if(PROJECT_ENABLE_LIBBITCOIN_SYSTEM)
set(BOOST_MAJOR_VERSION ${BOOST2_MAJOR_VERSION})
@@ -95,19 +96,36 @@ if(PROJECT_ENABLE_BOOST)
endif()
if(PROJECT_ENABLE_LIBBITCOIN_SYSTEM)
set(BOOST_CXX_STANDARD 14)
set(BOOST_OPTIONS cxxflags=-Wno-enum-constexpr-conversion)
set(BOOST_CXX_STANDARD 17)
if (PROJECT_IS_DARWIN)
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})
set(BOOST_OPTIONS define=BOOST_ASIO_HAS_STD_STRING_VIEW)
endif()
if (PROJECT_IS_DARWIN)
set(BOOST_CXX_STD_DIALECT iso)
set(BOOST_OPTIONS ${BOOST_OPTIONS} -sICU_PATH=${PROJECT_EXTERNAL_BUILD_ROOT})
else()
set(BOOST_CXX_STD_DIALECT gnu)
endif()
set(BOOST_BUILD_ARGS
--openssldir=$ENV{OPENSSL_ROOT_DIR}
--prefix=${PROJECT_EXTERNAL_BUILD_ROOT}
address-model=64
architecture=${BOOST_ARCH}
cxxstd-dialect=gnu
cxxstd=${BOOST_CXX_STANDARD}
define=BOOST_SYSTEM_NO_DEPRECATED
link=${BOOST_LINK}
@@ -116,6 +134,15 @@ if(PROJECT_ENABLE_BOOST)
${BOOST_OPTIONS}
)
if (BOOST_CXX_FLAGS)
set(BOOST_BUILD_ARGS
${BOOST_BUILD_ARGS}
cflags=${BOOST_C_FLAGS}
cxxflags=${BOOST_CXX_FLAGS}
linkflags=${BOOST_LINK_FLAGS}
)
endif()
ExternalProject_Add(boost_project
PREFIX external
URL ${PROJECT_3RD_PARTY_DIR}/boost_${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}_${BOOST_PATCH_VERSION}.tar.gz