Add json.hpp to CI and Build Tools (open-telemetry#306)

TuckTuckFloof · Aug 31, 2020 · 965a0aa · 965a0aa
1 parent 78012e1
commit 965a0aa
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/ci/setup_cmake.sh b/ci/setup_cmake.sh
@@ -4,13 +4,19 @@ set -e
 
 export DEBIAN_FRONTEND=noninteractive
 apt-get update
-apt-get install --no-install-recommends --no-install-suggests -y \
+
+set +e
+echo		\
                 cmake \
                 libbenchmark-dev \
                 libgtest-dev \
                 zlib1g-dev \
                 sudo \
-                libcurl4-openssl-dev
+                libcurl4-openssl-dev \
+                nlohmann-json-dev \
+                nlohmann-json3 \
+                nlohmann-json3-dev | xargs -n 1 apt-get install --ignore-missing --no-install-recommends --no-install-suggests -y
+set -e
 
 # Follows these instructions for setting up gtest
 # https://www.eriksmistad.no/getting-started-with-google-test-on-ubuntu/

diff --git a/ci/setup_windows_ci_environment.ps1 b/ci/setup_windows_ci_environment.ps1
@@ -11,5 +11,10 @@ $VCPKG_DIR=(Get-Item -Path ".\").FullName
 # Patched Google Benchmark can be shared between vs2017 and vs2019 compilers
 ./vcpkg install --overlay-ports="$PSScriptRoot\ports" benchmark:x64-windows
 
+# Google Test
 ./vcpkg install gtest:x64-windows
+
+# nlohmann-json
+./vcpkg install nlohmann-json:x64-windows
+
 Pop-Location
diff --git a/tools/setup-buildtools-mac.sh b/tools/setup-buildtools-mac.sh
@@ -26,3 +26,6 @@ sudo chown -R $(whoami) /usr/local/etc/bash_completion.d /usr/local/include /usr
 brew install cmake
 brew install wget
 brew install clang-format
+brew install google-benchmark
+brew tap nlohmann/json
+brew install nlohmann-json