Skip to content

Commit

Permalink
Remove nlohmann JSON version check
Browse files Browse the repository at this point in the history
- The git submodule is pinned to that version, which should be enough of a hint that this is the version we expect. If someone builds with a different version and it passes tests, we should not block that.
  • Loading branch information
cameel committed Sep 2, 2024
1 parent 79f05ca commit b52094b
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 8 deletions.
2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,9 @@ option(PEDANTIC "Enable extra warnings and pedantic build flags. Treat all warni
option(PROFILE_OPTIMIZER_STEPS "Output performance metrics for the optimiser steps." OFF)
option(USE_SYSTEM_LIBRARIES "Use system libraries" OFF)
option(ONLY_BUILD_SOLIDITY_LIBRARIES "Only build solidity libraries" OFF)
option(STRICT_NLOHMANN_JSON_VERSION "Strictly check installed nlohmann json version" ON)
mark_as_advanced(PROFILE_OPTIMIZER_STEPS)
mark_as_advanced(USE_SYSTEM_LIBRARIES)
mark_as_advanced(ONLY_BUILD_SOLIDITY_LIBRARIES)
mark_as_advanced(STRICT_NLOHMANN_JSON_VERSION)

# Setup cccache.
include(EthCcache)
Expand Down
6 changes: 0 additions & 6 deletions libsolutil/JSON.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@

#include <sstream>

#ifdef STRICT_NLOHMANN_JSON_VERSION_CHECK
static_assert(
(NLOHMANN_JSON_VERSION_MAJOR == 3) && (NLOHMANN_JSON_VERSION_MINOR == 11) && (NLOHMANN_JSON_VERSION_PATCH == 3),
"Unexpected nlohmann-json version. Expecting 3.11.3.");
#endif

namespace solidity::util
{

Expand Down

0 comments on commit b52094b

Please sign in to comment.