Use nlohmann_json package instead of submodule (#2161)

2024-02-26 23:53:56 +00:00
parent 8a7a6c48f8
commit 11c5b64d39
9 changed files with 11 additions and 13 deletions
--- 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})
--- 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)
--- 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")
--- 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)