Use system copy of nlohmann_json on all platforms

LizardByte · Feb 24, 2024 · 47b00a0 · 47b00a0
1 parent 9b49963
commit 47b00a0
Show file tree

Hide file tree

Showing 18 changed files with 23 additions and 11 deletions.
diff --git a/.codeql-prebuild-cpp.sh b/.codeql-prebuild-cpp.sh
@@ -32,6 +32,7 @@ sudo apt-get install -y \
   libxfixes-dev \
   libxrandr-dev \
   libxtst-dev \
+  nlohmann-json3-dev \
   wget
 
 # clean apt cache

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -367,6 +367,7 @@ jobs:
             libxfixes-dev \
             libxrandr-dev \
             libxtst-dev \
+            nlohmann-json3-dev \
             wget
 
           # clean apt cache
@@ -519,7 +520,7 @@ jobs:
       - name: Setup Dependencies MacOS
         run: |
           # install dependencies using homebrew
-          brew install cmake curl miniupnpc node openssl opus pkg-config
+          brew install cmake curl miniupnpc nlohmann-json node openssl opus pkg-config
 
           # fix openssl header not found
           # ln -sf /usr/local/opt/openssl/include/openssl /usr/local/include/openssl
@@ -760,6 +761,7 @@ jobs:
             diffutils
             git
             make
+            mingw-w64-nlohmann-json
             mingw-w64-x86_64-binutils
             mingw-w64-x86_64-boost
             mingw-w64-x86_64-cmake

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
@@ -135,4 +135,4 @@ list(APPEND SUNSHINE_EXTERNAL_LIBRARIES
         ${OPENSSL_LIBRARIES}
         ${CURL_LIBRARIES}
         ${PLATFORM_LIBRARIES}
-        nlohmann_json::nlohmann_json)
+        PkgConfig::NLOHMANN_JSON)
diff --git a/cmake/dependencies/common.cmake b/cmake/dependencies/common.cmake
@@ -20,7 +20,7 @@ pkg_check_modules(MINIUPNP miniupnpc REQUIRED)
 include_directories(SYSTEM ${MINIUPNP_INCLUDE_DIRS})
 
 # nlohmann_json
-add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/nlohmann_json")
+pkg_check_modules(NLOHMANN_JSON nlohmann_json REQUIRED IMPORTED_TARGET)
 
 # ffmpeg pre-compiled binaries
 if(WIN32)

diff --git a/docker/clion-toolchain.dockerfile b/docker/clion-toolchain.dockerfile
@@ -54,6 +54,7 @@ apt-get install -y --no-install-recommends \
   libxfixes-dev \
   libxrandr-dev \
   libxtst-dev \
+  nlohmann-json3-dev \
   udev \
   wget
 if [[ "${TARGETPLATFORM}" == 'linux/amd64' ]]; then

diff --git a/docker/debian-bookworm.dockerfile b/docker/debian-bookworm.dockerfile
@@ -59,6 +59,7 @@ apt-get install -y --no-install-recommends \
   libxfixes-dev \
   libxrandr-dev \
   libxtst-dev \
+  nlohmann-json3-dev \
   nodejs \
   npm \
   udev \

diff --git a/docker/debian-bullseye.dockerfile b/docker/debian-bullseye.dockerfile
@@ -60,6 +60,7 @@ apt-get install -y --no-install-recommends \
   libxfixes-dev \
   libxrandr-dev \
   libxtst-dev \
+  nlohmann-json3-dev \
   udev \
   wget
 if [[ "${TARGETPLATFORM}" == 'linux/amd64' ]]; then

diff --git a/docker/fedora-38.dockerfile b/docker/fedora-38.dockerfile
@@ -35,6 +35,7 @@ dnf -y install \
   gcc-13.2.* \
   gcc-c++-13.2.* \
   git \
+  json-devel \
   libappindicator-gtk3-devel \
   libcap-devel \
   libcurl-devel \

diff --git a/docker/fedora-39.dockerfile b/docker/fedora-39.dockerfile
@@ -35,6 +35,7 @@ dnf -y install \
   gcc-13.2.* \
   gcc-c++-13.2.* \
   git \
+  json-devel \
   libappindicator-gtk3-devel \
   libcap-devel \
   libcurl-devel \

diff --git a/docker/ubuntu-20.04.dockerfile b/docker/ubuntu-20.04.dockerfile
@@ -61,6 +61,7 @@ apt-get install -y --no-install-recommends \
   libxfixes-dev \
   libxrandr-dev \
   libxtst-dev \
+  nlohmann-json3-dev \
   udev \
   wget
 if [[ "${TARGETPLATFORM}" == 'linux/amd64' ]]; then

diff --git a/docker/ubuntu-22.04.dockerfile b/docker/ubuntu-22.04.dockerfile
@@ -60,6 +60,7 @@ apt-get install -y --no-install-recommends \
   libxfixes-dev \
   libxrandr-dev \
   libxtst-dev \
+  nlohmann-json3-dev \
   udev \
   wget
 if [[ "${TARGETPLATFORM}" == 'linux/amd64' ]]; then

diff --git a/docs/source/building/linux.rst b/docs/source/building/linux.rst
@@ -42,6 +42,7 @@ Install Requirements
           libxfixes-dev \  # X11
           libxrandr-dev \  # X11
           libxtst-dev \  # X11
+          nlohmann-json3-dev \
           nodejs \
           npm \
           nvidia-cuda-dev \  # Cuda, NvFBC
@@ -61,6 +62,7 @@ Install Requirements
           gcc \
           gcc-c++ \
           intel-mediasdk-devel \ # x86_64 only
+          json-devel \
           libappindicator-gtk3-devel \
           libcap-devel \
           libcurl-devel \
@@ -126,6 +128,7 @@ Install Requirements
           libxfixes-dev \  # X11
           libxrandr-dev \  # X11
           libxtst-dev \  # X11
+          nlohmann-json3-dev \
           nodejs \
           npm \
           wget  # necessary for cuda install with `run` file
@@ -176,6 +179,7 @@ Install Requirements
           libxfixes-dev \  # X11
           libxrandr-dev \  # X11
           libxtst-dev \  # X11
+          nlohmann-json3-dev \
           nodejs \
           npm \
           nvidia-cuda-dev \  # CUDA, NvFBC

diff --git a/docs/source/building/macos.rst b/docs/source/building/macos.rst
@@ -12,14 +12,14 @@ MacPorts
 Install Requirements
    .. code-block:: bash
 
-      sudo port install avahi boost180 cmake curl libopus miniupnpc npm9 pkgconfig
+      sudo port install avahi boost180 cmake curl libopus miniupnpc nlohmann-json npm9 pkgconfig
 
 Homebrew
 """"""""
 Install Requirements
    .. code-block:: bash
 
-      brew install boost cmake miniupnpc node opus pkg-config
+      brew install boost cmake miniupnpc nlohmann-json node opus pkg-config
       # if there are issues with an SSL header that is not found:
       cd /usr/local/include
       ln -s ../opt/openssl/include/openssl .

diff --git a/docs/source/building/windows.rst b/docs/source/building/windows.rst
@@ -21,6 +21,7 @@ Install dependencies:
         gcc \
         git \
         make \
+        mingw-w64-nlohmann-json \
         mingw-w64-x86_64-binutils \
         mingw-w64-x86_64-boost \
         mingw-w64-x86_64-cmake \

diff --git a/packaging/linux/Arch/PKGBUILD b/packaging/linux/Arch/PKGBUILD
@@ -33,6 +33,7 @@ makedepends=('boost'
              'cmake'
              'git'
              'make'
+             'nlohmann-json'
              'nodejs'
              'npm')
 optdepends=('cuda: NvFBC capture support'

diff --git a/packaging/macos/Portfile b/packaging/macos/Portfile
@@ -31,7 +31,8 @@ post-fetch {
     system -W ${worksrcpath} "${git.cmd} submodule update --init --recursive"
 }
 
-depends_build            port:npm9 \
+depends_build            port:nlohmann-json \
+                         port:npm9 \
                          port:pkgconfig
 
 depends_lib              port:avahi \

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