Merge pull request #4308 from ethereum/hunter-jsoncpp

Hunter: jsoncpp

Author: pirapira

CMakeLists.txt

@@ -98,8 +98,10 @@ include(EthUtils)
 hunter_add_package(Boost COMPONENTS filesystem random system thread test)
 find_package(Boost CONFIG REQUIRED filesystem random system thread unit_test_framework)
 
+hunter_add_package(jsoncpp)
+find_package(jsoncpp CONFIG REQUIRED)
+
 include(ProjectCryptopp)
-include(ProjectJsonCpp)
 include(ProjectJsonRpcCpp)
 include(ProjectSecp256k1)
 include(ProjectSnark)

appveyor.yml

@@ -50,7 +50,7 @@ clone_script:
           git submodule -q update --init --recursive
       }
 cache:
-    - deps
+    - deps -> cmake/ProjectJsonRpc.cmake
 #RDP LOGIN details for trouble shooting
 #init:
 #    - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

cmake/EthCompilerSettings.cmake

@@ -18,8 +18,7 @@
 # ccache is auto-enabled if the tool is found. To disable set -DCCACHE=Off option.
 find_program(CCACHE ccache)
 if(CCACHE)
-	set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-	set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+	set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE})
 	message(STATUS "ccache enabled (${CCACHE})")
 endif()
 

cmake/ProjectJsonCpp.cmake

@@ -2,6 +2,9 @@
 # but we need to know the MHD location for static linking.
 find_package(MHD REQUIRED)
 
+get_property(jsoncpp_include_dir TARGET jsoncpp_lib_static PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+get_property(jsoncpp_library TARGET jsoncpp_lib_static PROPERTY IMPORTED_LOCATION_RELEASE)
+
 set(CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
                -DCMAKE_BUILD_TYPE=Release
                -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
@@ -18,17 +21,17 @@ set(CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
                -DCOMPILE_STUBGEN=Off
                -DCOMPILE_EXAMPLES=Off
                # Point to jsoncpp library.
-               -DJSONCPP_INCLUDE_DIR=${JSONCPP_INCLUDE_DIR}
+               -DJSONCPP_INCLUDE_DIR=${jsoncpp_include_dir}
                # Select jsoncpp include prefix: <json/...> or <jsoncpp/json/...>
                -DJSONCPP_INCLUDE_PREFIX=json
-               -DJSONCPP_LIBRARY=${JSONCPP_LIBRARY}
+               -DJSONCPP_LIBRARY=${jsoncpp_library}
                -DMHD_INCLUDE_DIR=${MHD_INCLUDE_DIR}
                -DMHD_LIBRARY=${MHD_LIBRARY})
 
 if (WIN32)
     # For Windows we have to provide also locations for debug libraries.
     set(CMAKE_ARGS ${CMAKE_ARGS}
-        -DJSONCPP_LIBRARY_DEBUG=${JSONCPP_LIBRARY}
+        -DJSONCPP_LIBRARY_DEBUG=${jsoncpp_library}
         -DMHD_LIBRARY_DEBUG=${MHD_LIBRARY})
 endif()
 
@@ -48,8 +51,6 @@ ExternalProject_Add(jsonrpccpp
     LOG_INSTALL 1
 )
 
-add_dependencies(jsonrpccpp jsoncpp)
-
 # Create imported libraries
 if (WIN32)
     # On Windows CMAKE_INSTALL_PREFIX is ignored and installs to dist dir.
@@ -64,8 +65,8 @@ file(MAKE_DIRECTORY ${JSONRPCCPP_INCLUDE_DIR})  # Must exist.
 add_library(JsonRpcCpp::Common STATIC IMPORTED)
 set_property(TARGET JsonRpcCpp::Common PROPERTY IMPORTED_CONFIGURATIONS Release)
 set_property(TARGET JsonRpcCpp::Common PROPERTY IMPORTED_LOCATION_RELEASE ${INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}jsonrpccpp-common${CMAKE_STATIC_LIBRARY_SUFFIX})
-set_property(TARGET JsonRpcCpp::Common PROPERTY INTERFACE_LINK_LIBRARIES JsonCpp)
-set_property(TARGET JsonRpcCpp::Common PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${JSONRPCCPP_INCLUDE_DIR} ${JSONCPP_INCLUDE_DIR})
+set_property(TARGET JsonRpcCpp::Common PROPERTY INTERFACE_LINK_LIBRARIES jsoncpp_lib_static)
+set_property(TARGET JsonRpcCpp::Common PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${JSONRPCCPP_INCLUDE_DIR} ${jsoncpp_include_dir})
 add_dependencies(JsonRpcCpp::Common jsonrpccpp)
 
 add_library(JsonRpcCpp::Server STATIC IMPORTED)

cmake/ProjectJsonRpcCpp.cmake

@@ -3,7 +3,7 @@ file(GLOB HEADERS "*.h")
 
 add_library(ethereum ${SRC_LIST} ${HEADERS})
 
-target_link_libraries(ethereum ${Boost_REGEX_LIBRARIES} JsonCpp)
+target_link_libraries(ethereum ${Boost_REGEX_LIBRARIES} jsoncpp_lib_static)
 
 find_package(Dev)
 find_package(Eth)

libethereum/CMakeLists.txt

@@ -21,7 +21,7 @@ file(GLOB HEADERS "*.h")
 
 add_library(evm ${SOURCES} ${HEADERS})
 
-target_link_libraries(evm PRIVATE ethcore)
+target_link_libraries(evm PRIVATE ethcore jsoncpp_lib_static)
 target_include_directories(evm PRIVATE ..)
 
 if (EVMJIT)