Import nhlomann/json

It is the single_include/json.hpp file from https://github.com/nlohmann/json/releases/tag/v3.10.4
ethereum · Nov 8, 2021 · 3f8f5ca · 3f8f5ca
1 parent a243f14
commit 3f8f5ca
Show file tree

Hide file tree

Showing 7 changed files with 26,643 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -42,7 +42,6 @@ include(EthCcache)
 # Let's find our dependencies
 include(EthDependencies)
 include(fmtlib)
-include(nlohmann-json)
 include(range-v3)
 
 find_package(Threads)

diff --git a/cmake/nlohmann-json.cmake b/cmake/nlohmann-json.cmake
diff --git a/libsolutil/CMakeLists.txt b/libsolutil/CMakeLists.txt
@@ -23,6 +23,7 @@ set(sources
 	Keccak256.h
 	LazyInit.h
 	LEB128.h
+	nlohmannjson.hpp
 	Numeric.cpp
 	Numeric.h
 	picosha2.h

diff --git a/libsolutil/JSON.h b/libsolutil/JSON.h
@@ -23,7 +23,7 @@
 
 #pragma once
 
-#include <json/json.hpp>
+#include <libsolutil/nlohmannjson.hpp>
 
 #include <string>