izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a dedicated library for working with JSON (#2047)

Browse Source
This commit is contained in:
Lukas Senionis
2024-01-21 00:05:35 +02:00
committed by GitHub
parent bed58cf8b9
commit bf1b9a20ec
16 changed files with 154 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/dependencies/common.cmake
View File

@@ -19,6 +19,9 @@ pkg_check_modules(CURL REQUIRED libcurl)
pkg_check_modules(MINIUPNP miniupnpc REQUIRED)
include_directories(SYSTEM ${MINIUPNP_INCLUDE_DIRS})
# nlohmann_json
add_subdirectory(third-party/nlohmann_json)
# ffmpeg pre-compiled binaries
if(WIN32)
if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64")

4
cmake/dependencies/windows.cmake
View File

@@ -1,6 +1,4 @@
# windows specific dependencies
set(Boost_USE_STATIC_LIBS ON) # cmake-lint: disable=C0103
# Boost >= 1.82.0 is required for boost::json::value::set_at_pointer() support
# todo - are we actually using json? I think this was attempted to be used in a PR, but we ended up not using json
find_package(Boost 1.82.0 COMPONENTS locale log filesystem program_options json REQUIRED)
find_package(Boost 1.71.0 COMPONENTS locale log filesystem program_options REQUIRED)