boost fixes
This commit is contained in:
@@ -94,28 +94,28 @@ if(PROJECT_ENABLE_BOOST)
|
|||||||
set(BOOST_LINK "static,shared")
|
set(BOOST_LINK "static,shared")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(PROJECT_ENABLE_LIBBITCOIN_SYSTEM)
|
||||||
|
set(BOOST_CXX_STANDARD 20)
|
||||||
|
else()
|
||||||
|
set(BOOST_CXX_STANDARD ${CMAKE_CXX_STANDARD})
|
||||||
|
endif()
|
||||||
|
|
||||||
set(BOOST_BUILD_ARGS
|
set(BOOST_BUILD_ARGS
|
||||||
--openssldir=$ENV{OPENSSL_ROOT_DIR}
|
--openssldir=$ENV{OPENSSL_ROOT_DIR}
|
||||||
--prefix=${PROJECT_EXTERNAL_BUILD_ROOT}
|
--prefix=${PROJECT_EXTERNAL_BUILD_ROOT}
|
||||||
address-model=64
|
address-model=64
|
||||||
architecture=${BOOST_ARCH}
|
architecture=${BOOST_ARCH}
|
||||||
cxxstd-dialect=gnu
|
cxxstd-dialect=gnu
|
||||||
cxxflags=-std=gnu++${CMAKE_CXX_STANDARD}
|
cxxflags=-std=gnu++${BOOST_CXX_STANDARD}
|
||||||
cxxstd=${CMAKE_CXX_STANDARD}
|
cxxstd=${BOOST_CXX_STANDARD}
|
||||||
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++${CMAKE_CXX_STANDARD}
|
linkflags=-std=gnu++${BOOST_CXX_STANDARD}
|
||||||
threading=multi
|
threading=multi
|
||||||
variant=${BOOST_BUILD_TYPE_LOWER}
|
variant=${BOOST_BUILD_TYPE_LOWER}
|
||||||
)
|
)
|
||||||
|
|
||||||
if(PROJECT_ENABLE_LIBBITCOIN_SYSTEM)
|
|
||||||
set(BOOST_URL_HASH SHA256=${BOOST2_HASH})
|
|
||||||
else()
|
|
||||||
set(BOOST_URL_HASH SHA256=${BOOST_HASH})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
ExternalProject_Add(boost_project
|
ExternalProject_Add(boost_project
|
||||||
PREFIX external
|
PREFIX external
|
||||||
URL ${PROJECT_3RD_PARTY_DIR}/boost_${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}_${BOOST_PATCH_VERSION}.tar.gz
|
URL ${PROJECT_3RD_PARTY_DIR}/boost_${BOOST_MAJOR_VERSION}_${BOOST_MINOR_VERSION}_${BOOST_PATCH_VERSION}.tar.gz
|
||||||
|
|||||||
@@ -495,7 +495,7 @@ RUN if [ -f "/3rd_party/boost_${MY_BOOST2_MAJOR_VERSION}_${MY_BOOST2_MINOR_VERSI
|
|||||||
&& ./bootstrap.sh \
|
&& ./bootstrap.sh \
|
||||||
--with-libraries=atomic,chrono,date_time,filesystem,iostreams,locale,log,program_options,random,regex,serialization,system,test,thread \
|
--with-libraries=atomic,chrono,date_time,filesystem,iostreams,locale,log,program_options,random,regex,serialization,system,test,thread \
|
||||||
address-model=64 \
|
address-model=64 \
|
||||||
cxxstd=${MY_CXX_STANDARD} \
|
cxxstd=20 \
|
||||||
cxxstd-dialect=gnu \
|
cxxstd-dialect=gnu \
|
||||||
architecture=x86 \
|
architecture=x86 \
|
||||||
link=static,shared \
|
link=static,shared \
|
||||||
@@ -509,7 +509,7 @@ RUN if [ -f "/3rd_party/boost_${MY_BOOST2_MAJOR_VERSION}_${MY_BOOST2_MINOR_VERSI
|
|||||||
--prefix=${MY_MINGW_DIR} \
|
--prefix=${MY_MINGW_DIR} \
|
||||||
-j${MY_NUM_JOBS} \
|
-j${MY_NUM_JOBS} \
|
||||||
address-model=64 \
|
address-model=64 \
|
||||||
cxxstd=${MY_CXX_STANDARD} \
|
cxxstd=20 \
|
||||||
cxxstd-dialect=gnu \
|
cxxstd-dialect=gnu \
|
||||||
architecture=x86 \
|
architecture=x86 \
|
||||||
link=static,shared \
|
link=static,shared \
|
||||||
@@ -552,8 +552,8 @@ RUN if [ -f "/3rd_party/boost_${MY_BOOST_MAJOR_VERSION}_${MY_BOOST_MINOR_VERSION
|
|||||||
-j${MY_NUM_JOBS} \
|
-j${MY_NUM_JOBS} \
|
||||||
address-model=64 \
|
address-model=64 \
|
||||||
architecture=x86 \
|
architecture=x86 \
|
||||||
cxxstd=${MY_CXX_STANDARD} \
|
cxxstd=${MY_CXX_STANDARD} \
|
||||||
cxxstd-dialect=gnu \
|
cxxstd-dialect=gnu \
|
||||||
link=static,shared \
|
link=static,shared \
|
||||||
target-os=windows \
|
target-os=windows \
|
||||||
threading=multi \
|
threading=multi \
|
||||||
|
|||||||
Reference in New Issue
Block a user