Import nhlomann/json

It is the single_include/json.hpp file from https://github.com/nlohmann/json/releases/tag/v3.10.2
This commit is contained in:
Alex Beregszaszi 2021-11-06 22:25:49 +00:00
parent 8372be3a99
commit cefaede268
7 changed files with 26643 additions and 16 deletions

View File

@ -43,7 +43,6 @@ include(EthCcache)
# Let's find our dependencies
include(EthDependencies)
include(fmtlib)
include(nlohmann-json)
include(range-v3)
find_package(Threads)

View File

@ -1,13 +0,0 @@
include(FetchContent)
FetchContent_Declare(
fmtlib
PREFIX "${CMAKE_BINARY_DIR}/deps"
DOWNLOAD_DIR "${CMAKE_SOURCE_DIR}/deps/nlohmann/json"
DOWNLOAD_NAME json.hpp
DOWNLOAD_NO_EXTRACT 1
URL https://github.com/nlohmann/json/releases/download/v3.10.2/json.hpp
URL_HASH SHA256=059743e48b37e41579ee3a92e82e984bfa0d2a9a2b20b175d04db8089f46f047
)
include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/deps/nlohmann)

View File

@ -23,6 +23,7 @@ set(sources
Keccak256.h
LazyInit.h
LEB128.h
nlohmannjson.hpp
Numeric.cpp
Numeric.h
picosha2.h

View File

@ -23,7 +23,7 @@
#pragma once
#include <json/json.hpp>
#include <libsolutil/nlohmannjson.hpp>
#include <string>

26640
libsolutil/nlohmannjson.hpp Normal file

File diff suppressed because it is too large Load Diff

View File

@ -6,6 +6,7 @@ ERROR_LOG="$(mktemp -t check_style_XXXXXX.log)"
EXCLUDE_FILES=(
"libsolutil/picosha2.h"
"libsolutil/nlohmannjson.hpp"
"test/cmdlineTests/strict_asm_only_cr/input.yul"
"test/cmdlineTests/strict_asm_only_cr/err"
"test/libsolutil/UTF8.cpp"

View File

@ -127,7 +127,6 @@ mv solidity solc
mkdir -p ./solc/deps/downloads/ 2>/dev/null || true
wget -O ./solc/deps/downloads/range-v3-0.12.0.tar.gz https://github.com/ericniebler/range-v3/archive/0.12.0.tar.gz
wget -O ./solc/deps/downloads/fmt-8.0.1.tar.gz https://github.com/fmtlib/fmt/archive/8.0.1.tar.gz
wget -O ./solc/deps/nlohmann/json/json.hpp https://github.com/nlohmann/json/releases/download/v3.10.2/json.hpp
# Determine version
cd solc