jyapayne/Sunshine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use nlohmann_json package instead of submodule (#2161)

Browse source
This commit is contained in:
James Le Cuirot 2024-02-26 23:53:56 +00:00 • committed by GitHub
commit 11c5b64d39
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cmake/dependencies/common.cmake
View file

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

3
cmake/dependencies/windows.cmake
View file

@ -2,3 +2,6 @@
set(Boost_USE_STATIC_LIBS ON) # cmake-lint: disable=C0103
find_package(Boost 1.71.0 COMPONENTS locale log filesystem program_options REQUIRED)
# nlohmann_json
pkg_check_modules(NLOHMANN_JSON nlohmann_json REQUIRED IMPORTED_TARGET)