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

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
parent 8a7a6c48f8
commit 11c5b64d39
9 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/CI.yml vendored
View File

@@ -769,6 +769,7 @@ jobs:
mingw-w64-x86_64-cmake mingw-w64-x86_64-cmake
mingw-w64-x86_64-curl mingw-w64-x86_64-curl
mingw-w64-x86_64-miniupnpc mingw-w64-x86_64-miniupnpc
mingw-w64-x86_64-nlohmann-json
mingw-w64-x86_64-nodejs mingw-w64-x86_64-nodejs
mingw-w64-x86_64-nsis mingw-w64-x86_64-nsis
mingw-w64-x86_64-onevpl mingw-w64-x86_64-onevpl

4
.gitmodules vendored
View File

@@ -10,10 +10,6 @@
path = third-party/nanors path = third-party/nanors
url = https://github.com/sleepybishop/nanors.git url = https://github.com/sleepybishop/nanors.git
branch = master branch = master
[submodule "third-party/nlohmann_json"]
path = third-party/nlohmann_json
url = https://github.com/nlohmann/json
branch = master
[submodule "third-party/nv-codec-headers"] [submodule "third-party/nv-codec-headers"]
path = third-party/nv-codec-headers path = third-party/nv-codec-headers
url = https://github.com/FFmpeg/nv-codec-headers url = https://github.com/FFmpeg/nv-codec-headers

3
cmake/compile_definitions/common.cmake
View File

@@ -152,5 +152,4 @@ list(APPEND SUNSHINE_EXTERNAL_LIBRARIES
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${OPENSSL_LIBRARIES} ${OPENSSL_LIBRARIES}
${CURL_LIBRARIES} ${CURL_LIBRARIES}
${PLATFORM_LIBRARIES} ${PLATFORM_LIBRARIES})
nlohmann_json::nlohmann_json)

1
cmake/compile_definitions/windows.cmake
View File

@@ -84,6 +84,7 @@ list(PREPEND PLATFORM_LIBRARIES
avrt avrt
iphlpapi iphlpapi
shlwapi shlwapi
PkgConfig::NLOHMANN_JSON
${CURL_STATIC_LIBRARIES}) ${CURL_STATIC_LIBRARIES})
if(SUNSHINE_ENABLE_TRAY) if(SUNSHINE_ENABLE_TRAY)

3
cmake/dependencies/common.cmake
View File

@@ -19,9 +19,6 @@ pkg_check_modules(CURL REQUIRED libcurl)
pkg_check_modules(MINIUPNP miniupnpc REQUIRED) pkg_check_modules(MINIUPNP miniupnpc REQUIRED)
include_directories(SYSTEM ${MINIUPNP_INCLUDE_DIRS}) include_directories(SYSTEM ${MINIUPNP_INCLUDE_DIRS})
# nlohmann_json
add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/nlohmann_json")
# ffmpeg pre-compiled binaries # ffmpeg pre-compiled binaries
if(WIN32) if(WIN32)
if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") 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 set(Boost_USE_STATIC_LIBS ON) # cmake-lint: disable=C0103
find_package(Boost 1.71.0 COMPONENTS locale log filesystem program_options REQUIRED) 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)

1
docs/source/building/windows.rst
View File

@@ -26,6 +26,7 @@ Install dependencies:
mingw-w64-x86_64-cmake \ mingw-w64-x86_64-cmake \
mingw-w64-x86_64-curl \ mingw-w64-x86_64-curl \
mingw-w64-x86_64-miniupnpc \ mingw-w64-x86_64-miniupnpc \
mingw-w64-x86_64-nlohmann-json \
mingw-w64-x86_64-nodejs \ mingw-w64-x86_64-nodejs \
mingw-w64-x86_64-onevpl \ mingw-w64-x86_64-onevpl \
mingw-w64-x86_64-openssl \ mingw-w64-x86_64-openssl \

7
packaging/macos/Portfile
View File

@@ -31,12 +31,13 @@ post-fetch {
system -W ${worksrcpath} "${git.cmd} submodule update --init --recursive" system -W ${worksrcpath} "${git.cmd} submodule update --init --recursive"
} }
depends_build-append port:npm9 \
port:pkgconfig
depends_lib port:avahi \ depends_lib port:avahi \
port:curl \ port:curl \
port:libopus \ port:libopus \
port:miniupnpc \ port:miniupnpc
port:npm9 \
port:pkgconfig
boost.version 1.81 boost.version 1.81

1
third-party/nlohmann_json vendored

Submodule third-party/nlohmann_json deleted from 9cca280a4d