Merge pull request #103 from chuckatkins/move-jsonhpp-to-thirdparty (a0866239) · Commits · Podhorszki, Norbert / ADIOS2 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

ADIOS2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

a0866239

Commit a0866239 authored 7 years ago by Atkins, Charles Vernon Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge pull request #103 from chuckatkins/move-jsonhpp-to-thirdparty

Move jsonhpp to thirdparty

parents f1f1d83b e4955677

No related branches found

No related tags found

Loading

Changes 8

Expand all Hide whitespace changes

Inline Side-by-side

Showing

source/dataman/CMakeLists.txt 4 additions, 1 deletion

source/dataman/CMakeLists.txt
thirdparty/.clang-tidy 9 additions, 0 deletions

thirdparty/.clang-tidy
thirdparty/CMakeLists.txt 1 addition, 0 deletions

thirdparty/CMakeLists.txt
thirdparty/NLohmannJson/CMakeLists.txt 4 additions, 0 deletions

thirdparty/NLohmannJson/CMakeLists.txt
thirdparty/NLohmannJson/Readme.txt 4 additions, 0 deletions

thirdparty/NLohmannJson/Readme.txt
thirdparty/NLohmannJson/json/LICENSE.MIT 21 additions, 0 deletions

thirdparty/NLohmannJson/json/LICENSE.MIT
thirdparty/NLohmannJson/json/src/json.hpp 4657 additions, 6208 deletions

thirdparty/NLohmannJson/json/src/json.hpp
thirdparty/NLohmannJson/update.sh 22 additions, 0 deletions

thirdparty/NLohmannJson/update.sh

with 4722 additions and 6209 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment