diff --git a/ci/setup_cmake.sh b/ci/setup_cmake.sh index 34097dbaa3..5693064c65 100755 --- 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 index 6e2c91e467..e7cdfeda97 100755 --- 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 index b74c727df4..aee85a456f 100644 --- 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