Skip to content

Add json.hpp to CI and Build Tools #306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reyang merged 8 commits into from
Aug 31, 2020
+16 −2
Merged

Add json.hpp to CI and Build Tools #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fb2c087
Add json.hpp to CI and Build Tools
maxgolov Aug 28, 2020
4b7f120
Fix an issue with Ubuntu 18.04 not liking --ignore-missing
maxgolov Aug 28, 2020
6a8f1e4
Package name for json.hpp is different between Ubuntu 18.xx and 20.xx…
maxgolov Aug 28, 2020
a4d33da
Install either v2 or v3 of nlohmann json.hpp depending on distro
maxgolov Aug 28, 2020
61411fd
Update setup_windows_ci_environment.ps1
maxgolov Aug 28, 2020
a3df543
Merge branch 'master' into maxgolov/cmake_fixes
maxgolov Aug 28, 2020
38fc5a2
Merge branch 'master' into maxgolov/cmake_fixes
maxgolov Aug 28, 2020
081094f
Merge branch 'master' into maxgolov/cmake_fixes
maxgolov Aug 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions ci/setup_cmake.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Copy link
Copy Markdown
Contributor Author

@maxgolov maxgolov Aug 28, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Main reason why I need to ignore the errors / skip missing, is because the package name / version is different between distros. I'm trying to keep this setup script universal to work for any recent distro (Ubuntu 16.xx, 18.xx, 20.xx).. Basically, we "install whatever available" json.hpp . Ideally we may want to reconsider, and either use PPA to install latest, OR add specific version we need as git submodule.

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/
Expand Down
5 changes: 5 additions & 0 deletions ci/setup_windows_ci_environment.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions tools/setup-buildtools-mac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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