Use nlohmann_json package instead of submodule (LizardByte#2161)

KuleRucket · Jun 6, 2024 · e1985de · e1985de
1 parent 675e4fd
commit e1985de
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 13 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -769,6 +769,7 @@ jobs:
             mingw-w64-x86_64-cmake
             mingw-w64-x86_64-curl
             mingw-w64-x86_64-miniupnpc
+            mingw-w64-x86_64-nlohmann-json
             mingw-w64-x86_64-nodejs
             mingw-w64-x86_64-nsis
             mingw-w64-x86_64-onevpl

diff --git a/.gitmodules b/.gitmodules
@@ -10,10 +10,6 @@
 	path = third-party/nanors
 	url = https://github.com/sleepybishop/nanors.git
 	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"]
 	path = third-party/nv-codec-headers
 	url = https://github.com/FFmpeg/nv-codec-headers

diff --git a/cmake/compile_definitions/common.cmake b/cmake/compile_definitions/common.cmake
@@ -152,5 +152,4 @@ list(APPEND SUNSHINE_EXTERNAL_LIBRARIES
         ${Boost_LIBRARIES}
         ${OPENSSL_LIBRARIES}
         ${CURL_LIBRARIES}
-        ${PLATFORM_LIBRARIES}
-        nlohmann_json::nlohmann_json)
+        ${PLATFORM_LIBRARIES})
diff --git a/cmake/compile_definitions/windows.cmake b/cmake/compile_definitions/windows.cmake
@@ -84,6 +84,7 @@ list(PREPEND PLATFORM_LIBRARIES
         avrt
         iphlpapi
         shlwapi
+        PkgConfig::NLOHMANN_JSON
         ${CURL_STATIC_LIBRARIES})
 
 if(SUNSHINE_ENABLE_TRAY)

diff --git a/cmake/dependencies/common.cmake b/cmake/dependencies/common.cmake
@@ -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")

diff --git a/cmake/dependencies/windows.cmake b/cmake/dependencies/windows.cmake
@@ -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)
diff --git a/docs/source/building/windows.rst b/docs/source/building/windows.rst
@@ -26,6 +26,7 @@ Install dependencies:
         mingw-w64-x86_64-cmake \
         mingw-w64-x86_64-curl \
         mingw-w64-x86_64-miniupnpc \
+        mingw-w64-x86_64-nlohmann-json \
         mingw-w64-x86_64-nodejs \
         mingw-w64-x86_64-onevpl \
         mingw-w64-x86_64-openssl \

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

diff --git a/third-party/nlohmann_json b/third-party/nlohmann_json