diff --git a/cmake/libraries/boost.cmake b/cmake/libraries/boost.cmake index 7a69a978..a345372c 100644 --- a/cmake/libraries/boost.cmake +++ b/cmake/libraries/boost.cmake @@ -18,25 +18,47 @@ if(PROJECT_ENABLE_BOOST) if(PROJECT_BUILD) add_definitions(-DPROJECT_ENABLE_BOOST) - find_package(Boost ${BOOST_MAJOR_VERSION}.${BOOST_MINOR_VERSION}.${BOOST_PATCH_VERSION} EXACT - REQUIRED - COMPONENTS - atomic - chrono - date_time - filesystem - iostreams - locale - log - log_setup - program_options - random - regex - serialization - system - thread - wserialization - ) + if (PROJECT_ENABLE_LIBBITCOIN_SYSTEM) + find_package(Boost ${BOOST_MAJOR_VERSION}.${BOOST_MINOR_VERSION}.${BOOST_PATCH_VERSION} EXACT + REQUIRED + COMPONENTS + atomic + chrono + date_time + filesystem + iostreams + locale + log + log_setup + program_options + random + regex + serialization + system + thread + wserialization + ) + else() + find_package(Boost ${BOOST_MAJOR_VERSION}.${BOOST_MINOR_VERSION}.${BOOST_PATCH_VERSION} + REQUIRED + COMPONENTS + atomic + chrono + date_time + filesystem + iostreams + locale + log + log_setup + program_options + random + regex + serialization + system + thread + wserialization + ) + endif() include_directories(BEFORE SYSTEM ${Boost_INCLUDE_DIRS} diff --git a/cmake/versions.cmake b/cmake/versions.cmake index cd3ac409..60142bfe 100644 --- a/cmake/versions.cmake +++ b/cmake/versions.cmake @@ -1,18 +1,18 @@ set(BINUTILS_VERSION 2.41) -set(BOOST2_MAJOR_VERSION 1) -set(BOOST2_MINOR_VERSION 76) -set(BOOST2_PATCH_VERSION 0) set(BOOST_MAJOR_VERSION 1) set(BOOST_MINOR_VERSION 85) set(BOOST_PATCH_VERSION 0) +set(BOOST2_MAJOR_VERSION 1) +set(BOOST2_MINOR_VERSION 76) +set(BOOST2_PATCH_VERSION 0) set(CLI11_VERSION 2.4.2) set(CPP_HTTPLIB_VERSION 0.16.3) -set(CURL2_VERSION 8_9_1) set(CURL_VERSION 8.9.1) +set(CURL2_VERSION 8_9_1) set(CXXOPTS_VERSION 3.2.1) set(DTL_VERSION 2.01) -set(EXPAT2_VERSION 2_6_2) set(EXPAT_VERSION 2.6.2) +set(EXPAT2_VERSION 2_6_2) set(FLAC_VERSION 1.4.3) set(FMT_VERSION 11.0.2) set(FONTCONFIG_VERSION 2.15.0) @@ -44,8 +44,8 @@ set(SDL_VERSION 2.30.6) set(SECP256K1_VERSION 0.1.0.20) set(SFML_VERSION 2.6.1) set(SPDLOG_VERSION 1.14.1) -set(SQLITE2_VERSION 3.46.1) set(SQLITE_VERSION 3460100) +set(SQLITE2_VERSION 3.46.1) set(STDUUID_VERSION 1.2.3) set(VLC_VERSION 3.0) set(VORBIS_VERSION 1.3.7) diff --git a/docker/aarch64/alpine b/docker/aarch64/alpine index b0ca5ae3..3cd2c4b7 100644 --- a/docker/aarch64/alpine +++ b/docker/aarch64/alpine @@ -1,4 +1,4 @@ -FROM arm64v8/alpine:3.20.2 +FROM arm64v8/alpine:3.20.3 MAINTAINER Scott E. Graves CMD bash diff --git a/docker/x86_64/alpine b/docker/x86_64/alpine index f23b5b3f..ac79f66b 100644 --- a/docker/x86_64/alpine +++ b/docker/x86_64/alpine @@ -1,4 +1,4 @@ -FROM alpine:3.20.2 +FROM alpine:3.20.3 MAINTAINER Scott E. Graves CMD bash diff --git a/docker/x86_64/mingw64 b/docker/x86_64/mingw64 index dbfb5ac0..e18b8b37 100644 --- a/docker/x86_64/mingw64 +++ b/docker/x86_64/mingw64 @@ -1,5 +1,5 @@ #comment -FROM alpine:3.20.2 +FROM alpine:3.20.3 RUN apk update RUN apk upgrade