File find_jsoncpp.patch of Package solidity

Overview Repositories Revisions Requests Users Attributes Meta

File find_jsoncpp.patch of Package solidity

From: Adam Mizerski <adam@mizerski.pl>
Date: 2020-10-27 21:50
Upstream: no
Subject: find system jsoncpp

Index: solidity_0.7.4/libsolutil/JSON.cpp
===================================================================
--- solidity_0.7.4.orig/libsolutil/JSON.cpp
+++ solidity_0.7.4/libsolutil/JSON.cpp
@@ -32,11 +32,6 @@
 
 using namespace std;
 
-static_assert(
-	(JSONCPP_VERSION_MAJOR == 1) && (JSONCPP_VERSION_MINOR == 9) && (JSONCPP_VERSION_PATCH == 3),
-	"Unexpected jsoncpp version: " JSONCPP_VERSION_STRING ". Expecting 1.9.3."
-);
-
 namespace solidity::util
 {
 
Index: solidity_0.7.4/CMakeLists.txt
===================================================================
--- solidity_0.7.4.orig/CMakeLists.txt
+++ solidity_0.7.4/CMakeLists.txt
@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.9.0)
 
+include(FindPkgConfig)
+
 set(ETH_CMAKE_DIR   "${CMAKE_CURRENT_LIST_DIR}/cmake"   CACHE PATH "The the path to the cmake directory")
 list(APPEND CMAKE_MODULE_PATH ${ETH_CMAKE_DIR})
 
@@ -28,7 +30,7 @@ include(EthCcache)
 
 # Let's find our dependencies
 include(EthDependencies)
-include(jsoncpp)
+pkg_check_modules(JSONCPP REQUIRED jsoncpp)
 include_directories(SYSTEM ${JSONCPP_INCLUDE_DIR})
 
 find_package(Threads)

Places

File find_jsoncpp.patch of Package solidity

Places