updated build system

This commit is contained in:
Scott E. Graves 2024-09-24 07:32:27 -05:00
parent ceda21830f
commit 5000215973
5 changed files with 50 additions and 28 deletions

View File

@ -18,25 +18,47 @@ if(PROJECT_ENABLE_BOOST)
if(PROJECT_BUILD) if(PROJECT_BUILD)
add_definitions(-DPROJECT_ENABLE_BOOST) add_definitions(-DPROJECT_ENABLE_BOOST)
find_package(Boost ${BOOST_MAJOR_VERSION}.${BOOST_MINOR_VERSION}.${BOOST_PATCH_VERSION} EXACT if (PROJECT_ENABLE_LIBBITCOIN_SYSTEM)
REQUIRED find_package(Boost ${BOOST_MAJOR_VERSION}.${BOOST_MINOR_VERSION}.${BOOST_PATCH_VERSION} EXACT
COMPONENTS REQUIRED
atomic COMPONENTS
chrono atomic
date_time chrono
filesystem date_time
iostreams filesystem
locale iostreams
log locale
log_setup log
program_options log_setup
random program_options
regex random
serialization regex
system serialization
thread system
wserialization 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 include_directories(BEFORE SYSTEM
${Boost_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS}

View File

@ -1,18 +1,18 @@
set(BINUTILS_VERSION 2.41) 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_MAJOR_VERSION 1)
set(BOOST_MINOR_VERSION 85) set(BOOST_MINOR_VERSION 85)
set(BOOST_PATCH_VERSION 0) 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(CLI11_VERSION 2.4.2)
set(CPP_HTTPLIB_VERSION 0.16.3) set(CPP_HTTPLIB_VERSION 0.16.3)
set(CURL2_VERSION 8_9_1)
set(CURL_VERSION 8.9.1) set(CURL_VERSION 8.9.1)
set(CURL2_VERSION 8_9_1)
set(CXXOPTS_VERSION 3.2.1) set(CXXOPTS_VERSION 3.2.1)
set(DTL_VERSION 2.01) set(DTL_VERSION 2.01)
set(EXPAT2_VERSION 2_6_2)
set(EXPAT_VERSION 2.6.2) set(EXPAT_VERSION 2.6.2)
set(EXPAT2_VERSION 2_6_2)
set(FLAC_VERSION 1.4.3) set(FLAC_VERSION 1.4.3)
set(FMT_VERSION 11.0.2) set(FMT_VERSION 11.0.2)
set(FONTCONFIG_VERSION 2.15.0) set(FONTCONFIG_VERSION 2.15.0)
@ -44,8 +44,8 @@ set(SDL_VERSION 2.30.6)
set(SECP256K1_VERSION 0.1.0.20) set(SECP256K1_VERSION 0.1.0.20)
set(SFML_VERSION 2.6.1) set(SFML_VERSION 2.6.1)
set(SPDLOG_VERSION 1.14.1) set(SPDLOG_VERSION 1.14.1)
set(SQLITE2_VERSION 3.46.1)
set(SQLITE_VERSION 3460100) set(SQLITE_VERSION 3460100)
set(SQLITE2_VERSION 3.46.1)
set(STDUUID_VERSION 1.2.3) set(STDUUID_VERSION 1.2.3)
set(VLC_VERSION 3.0) set(VLC_VERSION 3.0)
set(VORBIS_VERSION 1.3.7) set(VORBIS_VERSION 1.3.7)

View File

@ -1,4 +1,4 @@
FROM arm64v8/alpine:3.20.2 FROM arm64v8/alpine:3.20.3
MAINTAINER Scott E. Graves <scott.e.graves@protonmail.com> MAINTAINER Scott E. Graves <scott.e.graves@protonmail.com>
CMD bash CMD bash

View File

@ -1,4 +1,4 @@
FROM alpine:3.20.2 FROM alpine:3.20.3
MAINTAINER Scott E. Graves <scott.e.graves@protonmail.com> MAINTAINER Scott E. Graves <scott.e.graves@protonmail.com>
CMD bash CMD bash

View File

@ -1,5 +1,5 @@
#comment #comment
FROM alpine:3.20.2 FROM alpine:3.20.3
RUN apk update RUN apk update
RUN apk upgrade RUN apk upgrade