From 8660bd3b4ec0de770d121aaa94bf224850341c62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Mon, 24 Apr 2017 01:45:10 +0200 Subject: [PATCH 1/5] Do not search for curl --- cmake/EthDependencies.cmake | 6 ---- cmake/FindCURL.cmake | 57 ------------------------------------- 2 files changed, 63 deletions(-) delete mode 100644 cmake/FindCURL.cmake diff --git a/cmake/EthDependencies.cmake b/cmake/EthDependencies.cmake index 1bd27fb48..4eb6b607e 100644 --- a/cmake/EthDependencies.cmake +++ b/cmake/EthDependencies.cmake @@ -33,12 +33,6 @@ find_package (json_rpc_cpp 0.4 REQUIRED) message (" - json-rpc-cpp header: ${JSON_RPC_CPP_INCLUDE_DIRS}") message (" - json-rpc-cpp lib : ${JSON_RPC_CPP_LIBRARIES}") -# curl is only requried for tests -# TODO specify min curl version, on windows we are currently using 7.29 -find_package (CURL) -message(" - curl header: ${CURL_INCLUDE_DIRS}") -message(" - curl lib : ${CURL_LIBRARIES}") - find_package (CUDA) if (CUDA_FOUND) message(" - CUDA header: ${CUDA_INCLUDE_DIRS}") diff --git a/cmake/FindCURL.cmake b/cmake/FindCURL.cmake deleted file mode 100644 index f9d2693ec..000000000 --- a/cmake/FindCURL.cmake +++ /dev/null @@ -1,57 +0,0 @@ -# Find CURL -# -# Find the curl includes and library -# -# if you nee to add a custom library search path, do it via via CMAKE_PREFIX_PATH -# -# This module defines -# CURL_INCLUDE_DIRS, where to find header, etc. -# CURL_LIBRARIES, the libraries needed to use curl. -# CURL_FOUND, If false, do not try to use curl. - -# only look in default directories -find_path( - CURL_INCLUDE_DIR - NAMES curl/curl.h - DOC "curl include dir" -) - -find_library( - CURL_LIBRARY - # names from cmake's FindCURL - NAMES curl curllib libcurl_imp curllib_static libcurl - DOC "curl library" -) - -set(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIR}) -set(CURL_LIBRARIES ${CURL_LIBRARY}) - -# debug library on windows -# same naming convention as in qt (appending debug library with d) -# boost is using the same "hack" as us with "optimized" and "debug" -if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") - - find_library( - CURL_LIBRARY_DEBUG - NAMES curld libcurld - DOC "curl debug library" - ) - - set(CURL_LIBRARIES optimized ${CURL_LIBRARIES} debug ${CURL_LIBRARY_DEBUG}) - - # prepare dlls - string(REPLACE ".lib" ".dll" CURL_DLL ${CURL_LIBRARY}) - string(REPLACE "/lib/" "/bin/" CURL_DLL ${CURL_DLL}) - string(REPLACE ".lib" ".dll" CURL_DLL_DEBUG ${CURL_LIBRARY_DEBUG}) - string(REPLACE "/lib/" "/bin/" CURL_DLL_DEBUG ${CURL_DLL_DEBUG}) - set(CURL_DLLS optimized ${CURL_DLL} debug ${CURL_DLL_DEBUG}) - -endif() - -# handle the QUIETLY and REQUIRED arguments and set CURL_FOUND to TRUE -# if all listed variables are TRUE, hide their existence from configuration view -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(CURL DEFAULT_MSG - CURL_INCLUDE_DIR CURL_LIBRARY) -mark_as_advanced (CURL_INCLUDE_DIR CURL_LIBRARY) - From 98fa4e469ec964c149628db8c97e1877ebc22747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Mon, 24 Apr 2017 02:00:33 +0200 Subject: [PATCH 2/5] Use jsoncpp from hunter --- CMakeLists.txt | 3 +++ cmake/EthDependencies.cmake | 12 ------------ libstratum/CMakeLists.txt | 7 ++----- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 230dc5217..a49fef602 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -141,6 +141,9 @@ endif () hunter_add_package(Boost COMPONENTS system) find_package(Boost CONFIG REQUIRED COMPONENTS system) +hunter_add_package(jsoncpp) +find_package(jsoncpp CONFIG REQUIRED) + include(EthDependencies) configureProject() diff --git a/cmake/EthDependencies.cmake b/cmake/EthDependencies.cmake index 4eb6b607e..4c82ccfe4 100644 --- a/cmake/EthDependencies.cmake +++ b/cmake/EthDependencies.cmake @@ -22,13 +22,6 @@ set(ETH_SCRIPTS_DIR ${CMAKE_CURRENT_LIST_DIR}/scripts) find_program(CTEST_COMMAND ctest) message(STATUS "ctest path: ${CTEST_COMMAND}") -# Dependencies must have a version number, to ensure reproducible build. The version provided here is the one that is in the extdep repository. If you use system libraries, version numbers may be different. - -# TODO the Jsoncpp package does not yet check for correct version number -find_package (Jsoncpp 0.60 REQUIRED) -message(" - Jsoncpp header: ${JSONCPP_INCLUDE_DIRS}") -message(" - Jsoncpp lib : ${JSONCPP_LIBRARIES}") - find_package (json_rpc_cpp 0.4 REQUIRED) message (" - json-rpc-cpp header: ${JSON_RPC_CPP_INCLUDE_DIRS}") message (" - json-rpc-cpp lib : ${JSON_RPC_CPP_LIBRARIES}") @@ -42,8 +35,3 @@ endif() # find location of jsonrpcstub find_program(ETH_JSON_RPC_STUB jsonrpcstub) message(" - jsonrpcstub location : ${ETH_JSON_RPC_STUB}") - -if (APPLE) - link_directories(/usr/local/lib) - include_directories(/usr/local/include) -endif() diff --git a/libstratum/CMakeLists.txt b/libstratum/CMakeLists.txt index 7edafed44..f6f4e1f75 100644 --- a/libstratum/CMakeLists.txt +++ b/libstratum/CMakeLists.txt @@ -1,11 +1,8 @@ -include_directories(..) -include_directories(${JSONCPP_INCLUDE_DIRS}) - set(SOURCES EthStratumClient.h EthStratumClient.cpp EthStratumClientV2.h EthStratumClientV2.cpp ) add_library(ethstratum ${SOURCES}) -target_link_libraries(ethstratum PUBLIC Boost::system) -target_include_directories(ethstratum PUBLIC SYSTEM ${JSONCPP_INCLUDE_DIRS}) +target_link_libraries(ethstratum PUBLIC Boost::system jsoncpp_lib_static) +target_include_directories(ethstratum PRIVATE ..) From e71aa579aeaa610739620fb3f8b6f937c241b37c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Mon, 24 Apr 2017 02:45:01 +0200 Subject: [PATCH 3/5] Build json-rpc-cpp from sources --- CMakeLists.txt | 2 + cmake/EthDependencies.cmake | 8 --- cmake/FindJsoncpp.cmake | 50 ------------- cmake/Findjson_rpc_cpp.cmake | 123 -------------------------------- cmake/scripts/jsonrpcstub.cmake | 44 ------------ ethminer/CMakeLists.txt | 15 +--- 6 files changed, 3 insertions(+), 239 deletions(-) delete mode 100644 cmake/FindJsoncpp.cmake delete mode 100644 cmake/Findjson_rpc_cpp.cmake delete mode 100644 cmake/scripts/jsonrpcstub.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index a49fef602..f21af7903 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -144,6 +144,8 @@ find_package(Boost CONFIG REQUIRED COMPONENTS system) hunter_add_package(jsoncpp) find_package(jsoncpp CONFIG REQUIRED) +include(ProjectJsonRpcCpp) + include(EthDependencies) configureProject() diff --git a/cmake/EthDependencies.cmake b/cmake/EthDependencies.cmake index 4c82ccfe4..ec0fb5b7b 100644 --- a/cmake/EthDependencies.cmake +++ b/cmake/EthDependencies.cmake @@ -22,16 +22,8 @@ set(ETH_SCRIPTS_DIR ${CMAKE_CURRENT_LIST_DIR}/scripts) find_program(CTEST_COMMAND ctest) message(STATUS "ctest path: ${CTEST_COMMAND}") -find_package (json_rpc_cpp 0.4 REQUIRED) -message (" - json-rpc-cpp header: ${JSON_RPC_CPP_INCLUDE_DIRS}") -message (" - json-rpc-cpp lib : ${JSON_RPC_CPP_LIBRARIES}") - find_package (CUDA) if (CUDA_FOUND) message(" - CUDA header: ${CUDA_INCLUDE_DIRS}") message(" - CUDA lib : ${CUDA_LIBRARIES}") endif() - -# find location of jsonrpcstub -find_program(ETH_JSON_RPC_STUB jsonrpcstub) -message(" - jsonrpcstub location : ${ETH_JSON_RPC_STUB}") diff --git a/cmake/FindJsoncpp.cmake b/cmake/FindJsoncpp.cmake deleted file mode 100644 index 1dbfc2046..000000000 --- a/cmake/FindJsoncpp.cmake +++ /dev/null @@ -1,50 +0,0 @@ -# Find jsoncpp -# -# Find the jsoncpp includes and library -# -# if you nee to add a custom library search path, do it via via CMAKE_PREFIX_PATH -# -# This module defines -# JSONCPP_INCLUDE_DIRS, where to find header, etc. -# JSONCPP_LIBRARIES, the libraries needed to use jsoncpp. -# JSONCPP_FOUND, If false, do not try to use jsoncpp. - -# only look in default directories -find_path( - JSONCPP_INCLUDE_DIR - NAMES json/json.h - PATH_SUFFIXES jsoncpp - DOC "jsoncpp include dir" -) - -find_library( - JSONCPP_LIBRARY - NAMES jsoncpp - DOC "jsoncpp library" -) - -set(JSONCPP_INCLUDE_DIRS ${JSONCPP_INCLUDE_DIR}) -set(JSONCPP_LIBRARIES ${JSONCPP_LIBRARY}) - -# debug library on windows -# same naming convention as in qt (appending debug library with d) -# boost is using the same "hack" as us with "optimized" and "debug" -if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") - - find_library( - JSONCPP_LIBRARY_DEBUG - NAMES jsoncppd - DOC "jsoncpp debug library" - ) - - set(JSONCPP_LIBRARIES optimized ${JSONCPP_LIBRARIES} debug ${JSONCPP_LIBRARY_DEBUG}) - -endif() - -# handle the QUIETLY and REQUIRED arguments and set JSONCPP_FOUND to TRUE -# if all listed variables are TRUE, hide their existence from configuration view -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(jsoncpp DEFAULT_MSG - JSONCPP_INCLUDE_DIR JSONCPP_LIBRARY) -mark_as_advanced (JSONCPP_INCLUDE_DIR JSONCPP_LIBRARY) - diff --git a/cmake/Findjson_rpc_cpp.cmake b/cmake/Findjson_rpc_cpp.cmake deleted file mode 100644 index 0bdbe4d5c..000000000 --- a/cmake/Findjson_rpc_cpp.cmake +++ /dev/null @@ -1,123 +0,0 @@ -# Find json-rcp-cpp -# -# Find the json-rpc-cpp includes and library -# -# if you nee to add a custom library search path, do it via via CMAKE_PREFIX_PATH -# -# This module defines -# JSON_RCP_CPP_INCLUDE_DIRS, where to find header, etc. -# JSON_RCP_CPP_LIBRARIES, the libraries needed to use json-rpc-cpp. -# JSON_RPC_CPP_SERVER_LIBRARIES, the libraries needed to use json-rpc-cpp-server -# JSON_RPC_CPP_CLIENT_LIBRARIES, the libraries needed to use json-rpc-cpp-client -# JSON_RCP_CPP_FOUND, If false, do not try to use json-rpc-cpp. -# JSON_RPC_CPP_VERSION, version of library -# JSON_RPC_CPP_VERSION_MAJOR -# JSON_RPC_CPP_VERSION_MINOR -# JSON_RPC_CPP_VERSION_PATCH - - -# only look in default directories -find_path( - JSON_RPC_CPP_INCLUDE_DIR - NAMES jsonrpccpp/server.h jsonrpc/server.h - PATH_SUFFIXES jsonrpc - DOC "json-rpc-cpp include dir" -) - -find_library( - JSON_RPC_CPP_COMMON_LIBRARY - NAMES jsonrpccpp-common - DOC "json-rpc-cpp common library" -) - -find_library( - JSON_RPC_CPP_SERVER_LIBRARY - NAMES jsonrpccpp-server - DOC "json-rpc-cpp server library" -) - -find_library( - JSON_RPC_CPP_CLIENT_LIBRARY - NAMES jsonrpccpp-client - DOC "json-rpc-cpp client library" -) - -# these are the variables to be uses by the calling script -set (JSON_RPC_CPP_INCLUDE_DIRS ${JSON_RPC_CPP_INCLUDE_DIR}) -set (JSON_RPC_CPP_LIBRARIES ${JSON_RPC_CPP_COMMON_LIBRARY} ${JSON_RPC_CPP_SERVER_LIBRARY} ${JSON_RPC_CPP_CLIENT_LIBRARY}) -set (JSON_RPC_CPP_SERVER_LIBRARIES ${JSON_RPC_CPP_COMMON_LIBRARY} ${JSON_RPC_CPP_SERVER_LIBRARY}) -set (JSON_RPC_CPP_CLIENT_LIBRARIES ${JSON_RPC_CPP_COMMON_LIBRARY} ${JSON_RPC_CPP_CLIENT_LIBRARY}) - -# debug library on windows -# same naming convention as in qt (appending debug library with d) -# boost is using the same "hack" as us with "optimized" and "debug" -if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") - - find_library( - JSON_RPC_CPP_COMMON_LIBRARY_DEBUG - NAMES jsonrpccpp-commond - DOC "json-rpc-cpp common debug library" - ) - - find_library( - JSON_RPC_CPP_SERVER_LIBRARY_DEBUG - NAMES jsonrpccpp-serverd - DOC "json-rpc-cpp server debug library" - ) - - find_library( - JSON_RPC_CPP_CLIENT_LIBRARY_DEBUG - NAMES jsonrpccpp-clientd - DOC "json-rpc-cpp client debug library" - ) - - set (JSON_RPC_CPP_LIBRARIES - optimized ${JSON_RPC_CPP_COMMON_LIBRARY} - optimized ${JSON_RPC_CPP_SERVER_LIBRARY} - optimized ${JSON_RPC_CPP_CLIENT_LIBRARY} - debug ${JSON_RPC_CPP_COMMON_LIBRARY_DEBUG} - debug ${JSON_RPC_CPP_SERVER_LIBRARY_DEBUG} - debug ${JSON_RPC_CPP_CLIENT_LIBRARY_DEBUG} - ) - - set (JSON_RPC_CPP_SERVER_LIBRARIES - optimized ${JSON_RPC_CPP_COMMON_LIBRARY} - optimized ${JSON_RPC_CPP_SERVER_LIBRARY} - debug ${JSON_RPC_CPP_COMMON_LIBRARY_DEBUG} - debug ${JSON_RPC_CPP_SERVER_LIBRARY_DEBUG} - ) - - set (JSON_RPC_CPP_CLIENT_LIBRARIES - optimized ${JSON_RPC_CPP_COMMON_LIBRARY} - optimized ${JSON_RPC_CPP_CLIENT_LIBRARY} - debug ${JSON_RPC_CPP_COMMON_LIBRARY_DEBUG} - debug ${JSON_RPC_CPP_CLIENT_LIBRARY_DEBUG} - ) - -endif() - -if (JSON_RPC_CPP_INCLUDE_DIR) - set (JSON_RPC_CPP_VERSION_HEADER "${JSON_RPC_CPP_INCLUDE_DIR}/jsonrpccpp/version.h") - if (EXISTS ${JSON_RPC_CPP_VERSION_HEADER}) - file (STRINGS ${JSON_RPC_CPP_VERSION_HEADER} JSON_RPC_CPP_VERSION_MAJOR REGEX "^#define JSONRPC_CPP_MAJOR_VERSION[ \t]+[0-9]+$") - file (STRINGS ${JSON_RPC_CPP_VERSION_HEADER} JSON_RPC_CPP_VERSION_MINOR REGEX "^#define JSONRPC_CPP_MINOR_VERSION[ \t]+[0-9]+$") - file (STRINGS ${JSON_RPC_CPP_VERSION_HEADER} JSON_RPC_CPP_VERSION_PATCH REGEX "^#define JSONRPC_CPP_PATCH_VERSION[ \t]+[0-9]+$") - string (REGEX REPLACE "^#define JSONRPC_CPP_MAJOR_VERSION[ \t]+([0-9]+)" "\\1" JSON_RPC_CPP_VERSION_MAJOR ${JSON_RPC_CPP_VERSION_MAJOR}) - string (REGEX REPLACE "^#define JSONRPC_CPP_MINOR_VERSION[ \t]+([0-9]+)" "\\1" JSON_RPC_CPP_VERSION_MINOR ${JSON_RPC_CPP_VERSION_MINOR}) - string (REGEX REPLACE "^#define JSONRPC_CPP_PATCH_VERSION[ \t]+([0-9]+)" "\\1" JSON_RPC_CPP_VERSION_PATCH ${JSON_RPC_CPP_VERSION_PATCH}) - set (JSON_RPC_CPP_VERSION ${JSON_RPC_CPP_VERSION_MAJOR}.${JSON_RPC_CPP_VERSION_MINOR}.${JSON_RPC_CPP_VERSION_PATCH}) - endif() -endif() - -# handle the QUIETLY and REQUIRED arguments and set JSON_RPC_CPP_FOUND to TRUE -# if all listed variables are TRUE, hide their existence from configuration view -include(FindPackageHandleStandardArgs) - -find_package_handle_standard_args( - json_rpc_cpp - REQUIRED_VARS JSON_RPC_CPP_INCLUDE_DIR JSON_RPC_CPP_COMMON_LIBRARY JSON_RPC_CPP_SERVER_LIBRARY JSON_RPC_CPP_CLIENT_LIBRARY - VERSION_VAR JSON_RPC_CPP_VERSION -) - -mark_as_advanced (JSON_RPC_CPP_INCLUDE_DIR JSON_RPC_CPP_COMMON_LIBRARY JSON_RPC_CPP_SERVER_LIBRARY JSON_RPC_CPP_CLIENT_LIBRARY) - diff --git a/cmake/scripts/jsonrpcstub.cmake b/cmake/scripts/jsonrpcstub.cmake deleted file mode 100644 index 64ca7864c..000000000 --- a/cmake/scripts/jsonrpcstub.cmake +++ /dev/null @@ -1,44 +0,0 @@ -# generates JSONRPC Stub Server && Client -# -# this script expects -# ETH_SOURCE_DIR - main CMAKE_SOURCE_DIR -# ETH_SPEC_PATH -# ETH_SERVER_DIR -# ETH_CLIENT_DIR -# ETH_SERVER_NAME -# ETH_CLIENT_NAME -# ETH_JSON_RPC_STUB -# -# example usage: -# cmake -DETH_SPEC_PATH=spec.json -DETH_SERVER_DIR=libweb3jsonrpc -DETH_CLIENT_DIR=test -# -DETH_SERVER_NAME=AbstractWebThreeStubServer -DETH_CLIENT_NAME=WebThreeStubClient -DETH_JSON_RPC_STUB=/usr/local/bin/jsonrpcstub - -# by default jsonrpcstub produces files in lowercase, we want to stick to this -string(TOLOWER ${ETH_SERVER_NAME} ETH_SERVER_NAME_LOWER) -string(TOLOWER ${ETH_CLIENT_NAME} ETH_CLIENT_NAME_LOWER) - -# setup names -set(SERVER_TMPFILE "${ETH_SERVER_DIR}/${ETH_SERVER_NAME_LOWER}.h.tmp") -set(SERVER_OUTFILE "${ETH_SERVER_DIR}/${ETH_SERVER_NAME_LOWER}.h") -set(CLIENT_TMPFILE "${ETH_CLIENT_DIR}/${ETH_CLIENT_NAME_LOWER}.h.tmp") -set(CLIENT_OUTFILE "${ETH_CLIENT_DIR}/${ETH_CLIENT_NAME_LOWER}.h") - -# create tmp files -execute_process( - COMMAND ${ETH_JSON_RPC_STUB} ${ETH_SPEC_PATH} - --cpp-server=${ETH_SERVER_NAME} --cpp-server-file=${SERVER_TMPFILE} - --cpp-client=${ETH_CLIENT_NAME} --cpp-client-file=${CLIENT_TMPFILE} - OUTPUT_VARIABLE ERR ERROR_QUIET -) - -# don't throw fatal error on jsonrpcstub error, someone might have old version of jsonrpcstub, -# he does not need to upgrade it if he is not working on JSON RPC -# show him warning instead -if (ERR) - message(WARNING "Your version of jsonrcpstub tool is not supported. Please upgrade it.") - message(WARNING "${ERR}") -else() - include("${ETH_SOURCE_DIR}/cmake/EthUtils.cmake") - replace_if_different("${SERVER_TMPFILE}" "${SERVER_OUTFILE}") - replace_if_different("${CLIENT_TMPFILE}" "${CLIENT_OUTFILE}") -endif() diff --git a/ethminer/CMakeLists.txt b/ethminer/CMakeLists.txt index b8ae9c892..baa91914d 100644 --- a/ethminer/CMakeLists.txt +++ b/ethminer/CMakeLists.txt @@ -4,11 +4,6 @@ aux_source_directory(. SRC_LIST) include_directories(BEFORE ..) -if (JSONRPC) - include_directories(BEFORE ${JSONCPP_INCLUDE_DIRS}) - include_directories(${JSON_RPC_CPP_INCLUDE_DIRS}) -endif() - if (ETHASHCUDA) include_directories(${CUDA_INCLUDE_DIRS}) endif () @@ -21,17 +16,9 @@ add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) add_dependencies(${EXECUTABLE} BuildInfo.h) -if (JSONRPC) - target_link_libraries(${EXECUTABLE} ${JSON_RPC_CPP_CLIENT_LIBRARIES}) - target_link_libraries(${EXECUTABLE} ${CURL_LIBRARIES}) - if (DEFINED WIN32 AND NOT DEFINED CMAKE_COMPILER_IS_MINGW) - eth_copy_dlls(${EXECUTABLE} CURL_DLLS) - endif() -endif() - target_link_libraries(${EXECUTABLE} ethcore) target_link_libraries(${EXECUTABLE} ethash) -target_link_libraries(${EXECUTABLE} devcore) +target_link_libraries(${EXECUTABLE} devcore JsonRpcCpp::Client) if (ETHSTRATUM) target_link_libraries(${EXECUTABLE} ethstratum) From eed51b8a7aa423af8aa299e0a5607a73dc11ba3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Mon, 24 Apr 2017 02:54:42 +0200 Subject: [PATCH 4/5] Remove unused CMake scripts --- CMakeLists.txt | 4 - cmake/CMakeParseArguments.cmake | 161 --------- cmake/EthExecutableHelper.cmake | 160 --------- cmake/FindPackageHandleStandardArgs.cmake | 382 ---------------------- cmake/FindPackageMessage.cmake | 57 ---- cmake/scripts/appdmg.cmake | 17 - cmake/scripts/macdeployfix.sh | 71 ---- cmake/scripts/resource.hpp.in | 30 -- cmake/scripts/resources.cmake | 57 ---- 9 files changed, 939 deletions(-) delete mode 100644 cmake/CMakeParseArguments.cmake delete mode 100644 cmake/EthExecutableHelper.cmake delete mode 100644 cmake/FindPackageHandleStandardArgs.cmake delete mode 100644 cmake/FindPackageMessage.cmake delete mode 100644 cmake/scripts/appdmg.cmake delete mode 100644 cmake/scripts/macdeployfix.sh delete mode 100644 cmake/scripts/resource.hpp.in delete mode 100644 cmake/scripts/resources.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index f21af7903..511482da9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -170,10 +170,6 @@ set(CMAKE_THREAD_LIBS_INIT pthread) endif() include(EthCompilerSettings) -message("-- CXXFLAGS: ${CMAKE_CXX_FLAGS}") - -# this must be an include, as a function it would mess up with variable scope! -include(EthExecutableHelper) message("creating build info...") createBuildInfo() diff --git a/cmake/CMakeParseArguments.cmake b/cmake/CMakeParseArguments.cmake deleted file mode 100644 index 8553f38f5..000000000 --- a/cmake/CMakeParseArguments.cmake +++ /dev/null @@ -1,161 +0,0 @@ -#.rst: -# CMakeParseArguments -# ------------------- -# -# -# -# CMAKE_PARSE_ARGUMENTS( -# args...) -# -# CMAKE_PARSE_ARGUMENTS() is intended to be used in macros or functions -# for parsing the arguments given to that macro or function. It -# processes the arguments and defines a set of variables which hold the -# values of the respective options. -# -# The argument contains all options for the respective macro, -# i.e. keywords which can be used when calling the macro without any -# value following, like e.g. the OPTIONAL keyword of the install() -# command. -# -# The argument contains all keywords for this macro -# which are followed by one value, like e.g. DESTINATION keyword of the -# install() command. -# -# The argument contains all keywords for this -# macro which can be followed by more than one value, like e.g. the -# TARGETS or FILES keywords of the install() command. -# -# When done, CMAKE_PARSE_ARGUMENTS() will have defined for each of the -# keywords listed in , and -# a variable composed of the given -# followed by "_" and the name of the respective keyword. These -# variables will then hold the respective value from the argument list. -# For the keywords this will be TRUE or FALSE. -# -# All remaining arguments are collected in a variable -# _UNPARSED_ARGUMENTS, this can be checked afterwards to see -# whether your macro was called with unrecognized parameters. -# -# As an example here a my_install() macro, which takes similar arguments -# as the real install() command: -# -# :: -# -# function(MY_INSTALL) -# set(options OPTIONAL FAST) -# set(oneValueArgs DESTINATION RENAME) -# set(multiValueArgs TARGETS CONFIGURATIONS) -# cmake_parse_arguments(MY_INSTALL "${options}" "${oneValueArgs}" -# "${multiValueArgs}" ${ARGN} ) -# ... -# -# -# -# Assume my_install() has been called like this: -# -# :: -# -# my_install(TARGETS foo bar DESTINATION bin OPTIONAL blub) -# -# -# -# After the cmake_parse_arguments() call the macro will have set the -# following variables: -# -# :: -# -# MY_INSTALL_OPTIONAL = TRUE -# MY_INSTALL_FAST = FALSE (this option was not used when calling my_install() -# MY_INSTALL_DESTINATION = "bin" -# MY_INSTALL_RENAME = "" (was not used) -# MY_INSTALL_TARGETS = "foo;bar" -# MY_INSTALL_CONFIGURATIONS = "" (was not used) -# MY_INSTALL_UNPARSED_ARGUMENTS = "blub" (no value expected after "OPTIONAL" -# -# -# -# You can then continue and process these variables. -# -# Keywords terminate lists of values, e.g. if directly after a -# one_value_keyword another recognized keyword follows, this is -# interpreted as the beginning of the new option. E.g. -# my_install(TARGETS foo DESTINATION OPTIONAL) would result in -# MY_INSTALL_DESTINATION set to "OPTIONAL", but MY_INSTALL_DESTINATION -# would be empty and MY_INSTALL_OPTIONAL would be set to TRUE therefor. - -#============================================================================= -# Copyright 2010 Alexander Neundorf -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) - - -if(__CMAKE_PARSE_ARGUMENTS_INCLUDED) - return() -endif() -set(__CMAKE_PARSE_ARGUMENTS_INCLUDED TRUE) - - -function(CMAKE_PARSE_ARGUMENTS prefix _optionNames _singleArgNames _multiArgNames) - # first set all result variables to empty/FALSE - foreach(arg_name ${_singleArgNames} ${_multiArgNames}) - set(${prefix}_${arg_name}) - endforeach() - - foreach(option ${_optionNames}) - set(${prefix}_${option} FALSE) - endforeach() - - set(${prefix}_UNPARSED_ARGUMENTS) - - set(insideValues FALSE) - set(currentArgName) - - # now iterate over all arguments and fill the result variables - foreach(currentArg ${ARGN}) - list(FIND _optionNames "${currentArg}" optionIndex) # ... then this marks the end of the arguments belonging to this keyword - list(FIND _singleArgNames "${currentArg}" singleArgIndex) # ... then this marks the end of the arguments belonging to this keyword - list(FIND _multiArgNames "${currentArg}" multiArgIndex) # ... then this marks the end of the arguments belonging to this keyword - - if(${optionIndex} EQUAL -1 AND ${singleArgIndex} EQUAL -1 AND ${multiArgIndex} EQUAL -1) - if(insideValues) - if("${insideValues}" STREQUAL "SINGLE") - set(${prefix}_${currentArgName} ${currentArg}) - set(insideValues FALSE) - elseif("${insideValues}" STREQUAL "MULTI") - list(APPEND ${prefix}_${currentArgName} ${currentArg}) - endif() - else() - list(APPEND ${prefix}_UNPARSED_ARGUMENTS ${currentArg}) - endif() - else() - if(NOT ${optionIndex} EQUAL -1) - set(${prefix}_${currentArg} TRUE) - set(insideValues FALSE) - elseif(NOT ${singleArgIndex} EQUAL -1) - set(currentArgName ${currentArg}) - set(${prefix}_${currentArgName}) - set(insideValues "SINGLE") - elseif(NOT ${multiArgIndex} EQUAL -1) - set(currentArgName ${currentArg}) - set(${prefix}_${currentArgName}) - set(insideValues "MULTI") - endif() - endif() - - endforeach() - - # propagate the result variables to the caller: - foreach(arg_name ${_singleArgNames} ${_multiArgNames} ${_optionNames}) - set(${prefix}_${arg_name} ${${prefix}_${arg_name}} PARENT_SCOPE) - endforeach() - set(${prefix}_UNPARSED_ARGUMENTS ${${prefix}_UNPARSED_ARGUMENTS} PARENT_SCOPE) - -endfunction() diff --git a/cmake/EthExecutableHelper.cmake b/cmake/EthExecutableHelper.cmake deleted file mode 100644 index dd4dafddb..000000000 --- a/cmake/EthExecutableHelper.cmake +++ /dev/null @@ -1,160 +0,0 @@ -# -# this function requires the following variables to be specified: -# ETH_VERSION -# PROJECT_NAME -# PROJECT_VERSION -# PROJECT_COPYRIGHT_YEAR -# PROJECT_VENDOR -# PROJECT_DOMAIN_SECOND -# PROJECT_DOMAIN_FIRST -# SRC_LIST -# HEADERS -# -# params: -# ICON -# - -macro(eth_add_executable EXECUTABLE) - set (extra_macro_args ${ARGN}) - set (options) - set (one_value_args ICON) - set (multi_value_args UI_RESOURCES WIN_RESOURCES) - cmake_parse_arguments (ETH_ADD_EXECUTABLE "${options}" "${one_value_args}" "${multi_value_args}" "${extra_macro_args}") - - if (APPLE) - - add_executable(${EXECUTABLE} MACOSX_BUNDLE ${SRC_LIST} ${HEADERS} ${ETH_ADD_EXECUTABLE_UI_RESOURCES}) - set(PROJECT_VERSION "${ETH_VERSION}") - set(MACOSX_BUNDLE_INFO_STRING "${PROJECT_NAME} ${PROJECT_VERSION}") - set(MACOSX_BUNDLE_BUNDLE_VERSION "${PROJECT_NAME} ${PROJECT_VERSION}") - set(MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_NAME} ${PROJECT_VERSION}") - set(MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION}") - set(MACOSX_BUNDLE_COPYRIGHT "${PROJECT_COPYRIGHT_YEAR} ${PROJECT_VENDOR}") - set(MACOSX_BUNDLE_GUI_IDENTIFIER "${PROJECT_DOMAIN_SECOND}.${PROJECT_DOMAIN_FIRST}") - set(MACOSX_BUNDLE_BUNDLE_NAME ${EXECUTABLE}) - set(MACOSX_BUNDLE_ICON_FILE ${ETH_ADD_EXECUTABLE_ICON}) - set_target_properties(${EXECUTABLE} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/EthereumMacOSXBundleInfo.plist.in") - set_source_files_properties(${EXECUTABLE} PROPERTIES MACOSX_PACKAGE_LOCATION MacOS) - set_source_files_properties(${MACOSX_BUNDLE_ICON_FILE}.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources) - - else () - add_executable(${EXECUTABLE} ${ETH_ADD_EXECUTABLE_UI_RESOURCES} ${ETH_ADD_EXECUTABLE_WIN_RESOURCES} ${SRC_LIST} ${HEADERS}) - endif() - -endmacro() - -macro(eth_copy_dll EXECUTABLE DLL) - # dlls must be unsubstitud list variable (without ${}) in format - # optimized;path_to_dll.dll;debug;path_to_dlld.dll - list(GET ${DLL} 1 DLL_RELEASE) - list(GET ${DLL} 3 DLL_DEBUG) - add_custom_command(TARGET ${EXECUTABLE} - POST_BUILD - COMMAND ${CMAKE_COMMAND} ARGS - -DDLL_RELEASE="${DLL_RELEASE}" - -DDLL_DEBUG="${DLL_DEBUG}" - -DCONF="$" - -DDESTINATION="${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}" - -P "${ETH_SCRIPTS_DIR}/copydlls.cmake" - ) -endmacro() - -macro(eth_copy_dlls EXECUTABLE) - foreach(dll ${ARGN}) - eth_copy_dll(${EXECUTABLE} ${dll}) - endforeach(dll) -endmacro() - -# -# this function requires the following variables to be specified: -# ETH_DEPENDENCY_INSTALL_DIR -# -# params: -# QMLDIR -# - -macro(eth_install_executable EXECUTABLE) - - set (extra_macro_args ${ARGN}) - set (options) - set (one_value_args QMLDIR) - set (multi_value_args DLLS) - cmake_parse_arguments (ETH_INSTALL_EXECUTABLE "${options}" "${one_value_args}" "${multi_value_args}" "${extra_macro_args}") - - if (ETH_INSTALL_EXECUTABLE_QMLDIR) - if (APPLE) - set(eth_qml_dir "-qmldir=${ETH_INSTALL_EXECUTABLE_QMLDIR}") - elseif (WIN32) - set(eth_qml_dir "--qmldir ${ETH_INSTALL_EXECUTABLE_QMLDIR}") - endif() - message(STATUS "${EXECUTABLE} qmldir: ${eth_qml_dir}") - endif() - - if (APPLE) - # First have qt5 install plugins and frameworks - add_custom_command(TARGET ${EXECUTABLE} POST_BUILD - COMMAND ${MACDEPLOYQT_APP} ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.app -executable=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.app/Contents/MacOS/${EXECUTABLE} ${eth_qml_dir} - WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} - COMMAND sh ${ETH_SCRIPTS_DIR}/macdeployfix.sh ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.app/Contents - ) - - # This tool and next will inspect linked libraries in order to determine which dependencies are required - if (${CMAKE_CFG_INTDIR} STREQUAL ".") - # TODO: This should only happen for GUI application - set(APP_BUNDLE_PATH "${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE}.app") - else () - set(APP_BUNDLE_PATH "${CMAKE_CURRENT_BINARY_DIR}/\$ENV{CONFIGURATION}/${EXECUTABLE}.app") - endif () - - install(CODE " - include(BundleUtilities) - set(BU_CHMOD_BUNDLE_ITEMS 1) - verify_app(\"${APP_BUNDLE_PATH}\") - " COMPONENT RUNTIME ) - - elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") - - get_target_property(TARGET_LIBS ${EXECUTABLE} INTERFACE_LINK_LIBRARIES) - string(REGEX MATCH "Qt5::Core" HAVE_QT ${TARGET_LIBS}) - if ("${HAVE_QT}" STREQUAL "Qt5::Core") - add_custom_command(TARGET ${EXECUTABLE} POST_BUILD - COMMAND cmd /C "set PATH=${Qt5Core_DIR}/../../../bin;%PATH% && ${WINDEPLOYQT_APP} ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.exe ${eth_qml_dir}" - WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} - ) - #workaround for https://bugreports.qt.io/browse/QTBUG-42083 - add_custom_command(TARGET ${EXECUTABLE} POST_BUILD - COMMAND cmd /C "(echo [Paths] & echo.Prefix=.)" > "qt.conf" - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} VERBATIM - ) - endif() - - #copy additional dlls - foreach(dll ${ETH_INSTALL_EXECUTABLE_DLLS}) - eth_copy_dll(${EXECUTABLE} ${dll}) - endforeach(dll) - - install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Debug" - DESTINATION . - CONFIGURATIONS Debug - COMPONENT ${EXECUTABLE} - ) - - install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/Release" - DESTINATION . - CONFIGURATIONS Release - COMPONENT ${EXECUTABLE} - ) - - install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/" - DESTINATION bin - CONFIGURATIONS RelWithDebInfo - COMPONENT ${EXECUTABLE} - ) - - else() - install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin) - endif () - -endmacro() - - diff --git a/cmake/FindPackageHandleStandardArgs.cmake b/cmake/FindPackageHandleStandardArgs.cmake deleted file mode 100644 index 6bcf1e788..000000000 --- a/cmake/FindPackageHandleStandardArgs.cmake +++ /dev/null @@ -1,382 +0,0 @@ -#.rst: -# FindPackageHandleStandardArgs -# ----------------------------- -# -# -# -# FIND_PACKAGE_HANDLE_STANDARD_ARGS( ... ) -# -# This function is intended to be used in FindXXX.cmake modules files. -# It handles the REQUIRED, QUIET and version-related arguments to -# find_package(). It also sets the _FOUND variable. The -# package is considered found if all variables ... listed contain -# valid results, e.g. valid filepaths. -# -# There are two modes of this function. The first argument in both -# modes is the name of the Find-module where it is called (in original -# casing). -# -# The first simple mode looks like this: -# -# :: -# -# FIND_PACKAGE_HANDLE_STANDARD_ARGS( -# (DEFAULT_MSG|"Custom failure message") ... ) -# -# If the variables to are all valid, then -# _FOUND will be set to TRUE. If DEFAULT_MSG is given -# as second argument, then the function will generate itself useful -# success and error messages. You can also supply a custom error -# message for the failure case. This is not recommended. -# -# The second mode is more powerful and also supports version checking: -# -# :: -# -# FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME -# [FOUND_VAR ] -# [REQUIRED_VARS ...] -# [VERSION_VAR ] -# [HANDLE_COMPONENTS] -# [CONFIG_MODE] -# [FAIL_MESSAGE "Custom failure message"] ) -# -# In this mode, the name of the result-variable can be set either to -# either _FOUND or _FOUND using the -# FOUND_VAR option. Other names for the result-variable are not -# allowed. So for a Find-module named FindFooBar.cmake, the two -# possible names are FooBar_FOUND and FOOBAR_FOUND. It is recommended -# to use the original case version. If the FOUND_VAR option is not -# used, the default is _FOUND. -# -# As in the simple mode, if through are all valid, -# _FOUND will be set to TRUE. After REQUIRED_VARS the -# variables which are required for this package are listed. Following -# VERSION_VAR the name of the variable can be specified which holds the -# version of the package which has been found. If this is done, this -# version will be checked against the (potentially) specified required -# version used in the find_package() call. The EXACT keyword is also -# handled. The default messages include information about the required -# version and the version which has been actually found, both if the -# version is ok or not. If the package supports components, use the -# HANDLE_COMPONENTS option to enable handling them. In this case, -# find_package_handle_standard_args() will report which components have -# been found and which are missing, and the _FOUND variable -# will be set to FALSE if any of the required components (i.e. not the -# ones listed after OPTIONAL_COMPONENTS) are missing. Use the option -# CONFIG_MODE if your FindXXX.cmake module is a wrapper for a -# find_package(... NO_MODULE) call. In this case VERSION_VAR will be -# set to _VERSION and the macro will automatically check whether -# the Config module was found. Via FAIL_MESSAGE a custom failure -# message can be specified, if this is not used, the default message -# will be displayed. -# -# Example for mode 1: -# -# :: -# -# find_package_handle_standard_args(LibXml2 DEFAULT_MSG -# LIBXML2_LIBRARY LIBXML2_INCLUDE_DIR) -# -# -# -# LibXml2 is considered to be found, if both LIBXML2_LIBRARY and -# LIBXML2_INCLUDE_DIR are valid. Then also LIBXML2_FOUND is set to -# TRUE. If it is not found and REQUIRED was used, it fails with -# FATAL_ERROR, independent whether QUIET was used or not. If it is -# found, success will be reported, including the content of . On -# repeated Cmake runs, the same message won't be printed again. -# -# Example for mode 2: -# -# :: -# -# find_package_handle_standard_args(LibXslt -# FOUND_VAR LibXslt_FOUND -# REQUIRED_VARS LibXslt_LIBRARIES LibXslt_INCLUDE_DIRS -# VERSION_VAR LibXslt_VERSION_STRING) -# -# In this case, LibXslt is considered to be found if the variable(s) -# listed after REQUIRED_VAR are all valid, i.e. LibXslt_LIBRARIES and -# LibXslt_INCLUDE_DIRS in this case. The result will then be stored in -# LibXslt_FOUND . Also the version of LibXslt will be checked by using -# the version contained in LibXslt_VERSION_STRING. Since no -# FAIL_MESSAGE is given, the default messages will be printed. -# -# Another example for mode 2: -# -# :: -# -# find_package(Automoc4 QUIET NO_MODULE HINTS /opt/automoc4) -# find_package_handle_standard_args(Automoc4 CONFIG_MODE) -# -# In this case, FindAutmoc4.cmake wraps a call to find_package(Automoc4 -# NO_MODULE) and adds an additional search directory for automoc4. Here -# the result will be stored in AUTOMOC4_FOUND. The following -# FIND_PACKAGE_HANDLE_STANDARD_ARGS() call produces a proper -# success/error message. - -#============================================================================= -# Copyright 2007-2009 Kitware, Inc. -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) - -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageMessage.cmake) -include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake) - -# internal helper macro -macro(_FPHSA_FAILURE_MESSAGE _msg) - if (${_NAME}_FIND_REQUIRED) - message(FATAL_ERROR "${_msg}") - else () - if (NOT ${_NAME}_FIND_QUIETLY) - message(STATUS "${_msg}") - endif () - endif () -endmacro() - - -# internal helper macro to generate the failure message when used in CONFIG_MODE: -macro(_FPHSA_HANDLE_FAILURE_CONFIG_MODE) - # _CONFIG is set, but FOUND is false, this means that some other of the REQUIRED_VARS was not found: - if(${_NAME}_CONFIG) - _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: missing: ${MISSING_VARS} (found ${${_NAME}_CONFIG} ${VERSION_MSG})") - else() - # If _CONSIDERED_CONFIGS is set, the config-file has been found, but no suitable version. - # List them all in the error message: - if(${_NAME}_CONSIDERED_CONFIGS) - set(configsText "") - list(LENGTH ${_NAME}_CONSIDERED_CONFIGS configsCount) - math(EXPR configsCount "${configsCount} - 1") - foreach(currentConfigIndex RANGE ${configsCount}) - list(GET ${_NAME}_CONSIDERED_CONFIGS ${currentConfigIndex} filename) - list(GET ${_NAME}_CONSIDERED_VERSIONS ${currentConfigIndex} version) - set(configsText "${configsText} ${filename} (version ${version})\n") - endforeach() - if (${_NAME}_NOT_FOUND_MESSAGE) - set(configsText "${configsText} Reason given by package: ${${_NAME}_NOT_FOUND_MESSAGE}\n") - endif() - _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} ${VERSION_MSG}, checked the following files:\n${configsText}") - - else() - # Simple case: No Config-file was found at all: - _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: found neither ${_NAME}Config.cmake nor ${_NAME_LOWER}-config.cmake ${VERSION_MSG}") - endif() - endif() -endmacro() - - -function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG) - -# set up the arguments for CMAKE_PARSE_ARGUMENTS and check whether we are in -# new extended or in the "old" mode: - set(options CONFIG_MODE HANDLE_COMPONENTS) - set(oneValueArgs FAIL_MESSAGE VERSION_VAR FOUND_VAR) - set(multiValueArgs REQUIRED_VARS) - set(_KEYWORDS_FOR_EXTENDED_MODE ${options} ${oneValueArgs} ${multiValueArgs} ) - list(FIND _KEYWORDS_FOR_EXTENDED_MODE "${_FIRST_ARG}" INDEX) - - if(${INDEX} EQUAL -1) - set(FPHSA_FAIL_MESSAGE ${_FIRST_ARG}) - set(FPHSA_REQUIRED_VARS ${ARGN}) - set(FPHSA_VERSION_VAR) - else() - - CMAKE_PARSE_ARGUMENTS(FPHSA "${options}" "${oneValueArgs}" "${multiValueArgs}" ${_FIRST_ARG} ${ARGN}) - - if(FPHSA_UNPARSED_ARGUMENTS) - message(FATAL_ERROR "Unknown keywords given to FIND_PACKAGE_HANDLE_STANDARD_ARGS(): \"${FPHSA_UNPARSED_ARGUMENTS}\"") - endif() - - if(NOT FPHSA_FAIL_MESSAGE) - set(FPHSA_FAIL_MESSAGE "DEFAULT_MSG") - endif() - endif() - -# now that we collected all arguments, process them - - if("x${FPHSA_FAIL_MESSAGE}" STREQUAL "xDEFAULT_MSG") - set(FPHSA_FAIL_MESSAGE "Could NOT find ${_NAME}") - endif() - - # In config-mode, we rely on the variable _CONFIG, which is set by find_package() - # when it successfully found the config-file, including version checking: - if(FPHSA_CONFIG_MODE) - list(INSERT FPHSA_REQUIRED_VARS 0 ${_NAME}_CONFIG) - list(REMOVE_DUPLICATES FPHSA_REQUIRED_VARS) - set(FPHSA_VERSION_VAR ${_NAME}_VERSION) - endif() - - if(NOT FPHSA_REQUIRED_VARS) - message(FATAL_ERROR "No REQUIRED_VARS specified for FIND_PACKAGE_HANDLE_STANDARD_ARGS()") - endif() - - list(GET FPHSA_REQUIRED_VARS 0 _FIRST_REQUIRED_VAR) - - string(TOUPPER ${_NAME} _NAME_UPPER) - string(TOLOWER ${_NAME} _NAME_LOWER) - - if(FPHSA_FOUND_VAR) - if(FPHSA_FOUND_VAR MATCHES "^${_NAME}_FOUND$" OR FPHSA_FOUND_VAR MATCHES "^${_NAME_UPPER}_FOUND$") - set(_FOUND_VAR ${FPHSA_FOUND_VAR}) - else() - message(FATAL_ERROR "The argument for FOUND_VAR is \"${FPHSA_FOUND_VAR}\", but only \"${_NAME}_FOUND\" and \"${_NAME_UPPER}_FOUND\" are valid names.") - endif() - else() - set(_FOUND_VAR ${_NAME_UPPER}_FOUND) - endif() - - # collect all variables which were not found, so they can be printed, so the - # user knows better what went wrong (#6375) - set(MISSING_VARS "") - set(DETAILS "") - # check if all passed variables are valid - unset(${_FOUND_VAR}) - foreach(_CURRENT_VAR ${FPHSA_REQUIRED_VARS}) - if(NOT ${_CURRENT_VAR}) - set(${_FOUND_VAR} FALSE) - set(MISSING_VARS "${MISSING_VARS} ${_CURRENT_VAR}") - else() - set(DETAILS "${DETAILS}[${${_CURRENT_VAR}}]") - endif() - endforeach() - if(NOT "${${_FOUND_VAR}}" STREQUAL "FALSE") - set(${_FOUND_VAR} TRUE) - endif() - - # component handling - unset(FOUND_COMPONENTS_MSG) - unset(MISSING_COMPONENTS_MSG) - - if(FPHSA_HANDLE_COMPONENTS) - foreach(comp ${${_NAME}_FIND_COMPONENTS}) - if(${_NAME}_${comp}_FOUND) - - if(NOT DEFINED FOUND_COMPONENTS_MSG) - set(FOUND_COMPONENTS_MSG "found components: ") - endif() - set(FOUND_COMPONENTS_MSG "${FOUND_COMPONENTS_MSG} ${comp}") - - else() - - if(NOT DEFINED MISSING_COMPONENTS_MSG) - set(MISSING_COMPONENTS_MSG "missing components: ") - endif() - set(MISSING_COMPONENTS_MSG "${MISSING_COMPONENTS_MSG} ${comp}") - - if(${_NAME}_FIND_REQUIRED_${comp}) - set(${_FOUND_VAR} FALSE) - set(MISSING_VARS "${MISSING_VARS} ${comp}") - endif() - - endif() - endforeach() - set(COMPONENT_MSG "${FOUND_COMPONENTS_MSG} ${MISSING_COMPONENTS_MSG}") - set(DETAILS "${DETAILS}[c${COMPONENT_MSG}]") - endif() - - # version handling: - set(VERSION_MSG "") - set(VERSION_OK TRUE) - set(VERSION ${${FPHSA_VERSION_VAR}}) - - # check with DEFINED here as the requested or found version may be "0" - if (DEFINED ${_NAME}_FIND_VERSION) - if(DEFINED ${FPHSA_VERSION_VAR}) - - if(${_NAME}_FIND_VERSION_EXACT) # exact version required - # count the dots in the version string - string(REGEX REPLACE "[^.]" "" _VERSION_DOTS "${VERSION}") - # add one dot because there is one dot more than there are components - string(LENGTH "${_VERSION_DOTS}." _VERSION_DOTS) - if (_VERSION_DOTS GREATER ${_NAME}_FIND_VERSION_COUNT) - # Because of the C++ implementation of find_package() ${_NAME}_FIND_VERSION_COUNT - # is at most 4 here. Therefore a simple lookup table is used. - if (${_NAME}_FIND_VERSION_COUNT EQUAL 1) - set(_VERSION_REGEX "[^.]*") - elseif (${_NAME}_FIND_VERSION_COUNT EQUAL 2) - set(_VERSION_REGEX "[^.]*\\.[^.]*") - elseif (${_NAME}_FIND_VERSION_COUNT EQUAL 3) - set(_VERSION_REGEX "[^.]*\\.[^.]*\\.[^.]*") - else () - set(_VERSION_REGEX "[^.]*\\.[^.]*\\.[^.]*\\.[^.]*") - endif () - string(REGEX REPLACE "^(${_VERSION_REGEX})\\..*" "\\1" _VERSION_HEAD "${VERSION}") - unset(_VERSION_REGEX) - if (NOT ${_NAME}_FIND_VERSION VERSION_EQUAL _VERSION_HEAD) - set(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"") - set(VERSION_OK FALSE) - else () - set(VERSION_MSG "(found suitable exact version \"${VERSION}\")") - endif () - unset(_VERSION_HEAD) - else () - if (NOT "${${_NAME}_FIND_VERSION}" VERSION_EQUAL "${VERSION}") - set(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"") - set(VERSION_OK FALSE) - else () - set(VERSION_MSG "(found suitable exact version \"${VERSION}\")") - endif () - endif () - unset(_VERSION_DOTS) - - else() # minimum version specified: - if ("${${_NAME}_FIND_VERSION}" VERSION_GREATER "${VERSION}") - set(VERSION_MSG "Found unsuitable version \"${VERSION}\", but required is at least \"${${_NAME}_FIND_VERSION}\"") - set(VERSION_OK FALSE) - else () - set(VERSION_MSG "(found suitable version \"${VERSION}\", minimum required is \"${${_NAME}_FIND_VERSION}\")") - endif () - endif() - - else() - - # if the package was not found, but a version was given, add that to the output: - if(${_NAME}_FIND_VERSION_EXACT) - set(VERSION_MSG "(Required is exact version \"${${_NAME}_FIND_VERSION}\")") - else() - set(VERSION_MSG "(Required is at least version \"${${_NAME}_FIND_VERSION}\")") - endif() - - endif() - else () - if(VERSION) - set(VERSION_MSG "(found version \"${VERSION}\")") - endif() - endif () - - if(VERSION_OK) - set(DETAILS "${DETAILS}[v${VERSION}(${${_NAME}_FIND_VERSION})]") - else() - set(${_FOUND_VAR} FALSE) - endif() - - - # print the result: - if (${_FOUND_VAR}) - FIND_PACKAGE_MESSAGE(${_NAME} "Found ${_NAME}: ${${_FIRST_REQUIRED_VAR}} ${VERSION_MSG} ${COMPONENT_MSG}" "${DETAILS}") - else () - - if(FPHSA_CONFIG_MODE) - _FPHSA_HANDLE_FAILURE_CONFIG_MODE() - else() - if(NOT VERSION_OK) - _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: ${VERSION_MSG} (found ${${_FIRST_REQUIRED_VAR}})") - else() - _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} (missing: ${MISSING_VARS}) ${VERSION_MSG}") - endif() - endif() - - endif () - - set(${_FOUND_VAR} ${${_FOUND_VAR}} PARENT_SCOPE) - -endfunction() diff --git a/cmake/FindPackageMessage.cmake b/cmake/FindPackageMessage.cmake deleted file mode 100644 index a0349d3db..000000000 --- a/cmake/FindPackageMessage.cmake +++ /dev/null @@ -1,57 +0,0 @@ -#.rst: -# FindPackageMessage -# ------------------ -# -# -# -# FIND_PACKAGE_MESSAGE( "message for user" "find result details") -# -# This macro is intended to be used in FindXXX.cmake modules files. It -# will print a message once for each unique find result. This is useful -# for telling the user where a package was found. The first argument -# specifies the name (XXX) of the package. The second argument -# specifies the message to display. The third argument lists details -# about the find result so that if they change the message will be -# displayed again. The macro also obeys the QUIET argument to the -# find_package command. -# -# Example: -# -# :: -# -# if(X11_FOUND) -# FIND_PACKAGE_MESSAGE(X11 "Found X11: ${X11_X11_LIB}" -# "[${X11_X11_LIB}][${X11_INCLUDE_DIR}]") -# else() -# ... -# endif() - -#============================================================================= -# Copyright 2008-2009 Kitware, Inc. -# -# Distributed under the OSI-approved BSD License (the "License"); -# see accompanying file Copyright.txt for details. -# -# This software is distributed WITHOUT ANY WARRANTY; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# See the License for more information. -#============================================================================= -# (To distribute this file outside of CMake, substitute the full -# License text for the above reference.) - -function(FIND_PACKAGE_MESSAGE pkg msg details) - # Avoid printing a message repeatedly for the same find result. - if(NOT ${pkg}_FIND_QUIETLY) - string(REPLACE "\n" "" details "${details}") - set(DETAILS_VAR FIND_PACKAGE_MESSAGE_DETAILS_${pkg}) - if(NOT "${details}" STREQUAL "${${DETAILS_VAR}}") - # The message has not yet been printed. - message(STATUS "${msg}") - - # Save the find details in the cache to avoid printing the same - # message again. - set("${DETAILS_VAR}" "${details}" - CACHE INTERNAL "Details about finding ${pkg}") - endif() - endif() -endfunction() diff --git a/cmake/scripts/appdmg.cmake b/cmake/scripts/appdmg.cmake deleted file mode 100644 index d9826ae9d..000000000 --- a/cmake/scripts/appdmg.cmake +++ /dev/null @@ -1,17 +0,0 @@ - -if (NOT APP_DMG_EXE) - message(FATAL_ERROR "Please install appdmg! https://github.com/LinusU/node-appdmg") -endif() - -string(REPLACE "/Contents/MacOS" "" ETH_MIX_APP "${ETH_MIX_APP}") -string(REPLACE "/Contents/MacOS" "" ETH_ALETHZERO_APP "${ETH_ALETHZERO_APP}") - -set(OUTFILE "${ETH_BUILD_DIR}/appdmg.json") - -configure_file(${APP_DMG_FILE} ${OUTFILE}) - -execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${APP_DMG_ICON}" "${ETH_BUILD_DIR}/appdmg_icon.icns") -execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${APP_DMG_BACKGROUND}" "${ETH_BUILD_DIR}/appdmg_background.png") -execute_process(COMMAND ${CMAKE_COMMAND} -E remove "${ETH_BUILD_DIR}/Ethereum.dmg") -execute_process(COMMAND ${APP_DMG_EXE} ${OUTFILE} "${ETH_BUILD_DIR}/Ethereum.dmg") - diff --git a/cmake/scripts/macdeployfix.sh b/cmake/scripts/macdeployfix.sh deleted file mode 100644 index 8f60c321a..000000000 --- a/cmake/scripts/macdeployfix.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/bash - -# solves problem with macdeployqt on Qt 5.4 RC and Qt 5.5 -# http://qt-project.org/forums/viewthread/50118 - -BUILD_FOLDER_PATH=$1 -BUILD_QML_FOLDER_PATH="$BUILD_FOLDER_PATH/Resources/qml" -BUILD_PLUGINS_FOLDER_PATH="$BUILD_FOLDER_PATH/PlugIns" - -if [ -d ${BUILD_QML_FOLDER_PATH} ]; then - - declare -a BROKEN_FILES; - k=0; - for j in $(find ${BUILD_QML_FOLDER_PATH} -name *.dylib); do - BROKEN_FILES[${k}]=$j - - ((k=k+1)) - done - - - for i in "${BROKEN_FILES[@]}"; do - REPLACE_STRING="$BUILD_FOLDER_PATH/" - APP_CONTENT_FILE=${i//$REPLACE_STRING/""} - IFS='/' read -a array <<< "$APP_CONTENT_FILE" - LENGTH=${#array[@]} - LAST_ITEM_INDEX=$((LENGTH-1)) - FILE=${array[${LENGTH} - 1]} - - ORIGINE_PATH=$(find ${BUILD_PLUGINS_FOLDER_PATH} -name ${FILE}) - ORIGINE_PATH=${ORIGINE_PATH//$REPLACE_STRING/""} - s="" - for((l=0;l<${LAST_ITEM_INDEX};l++)) do - s=$s"../" - done - s=$s$ORIGINE_PATH - echo "s: $s" - - REMOVE_BROKEN_ALIAS=$(rm -rf $i) - RESULT=$(ln -s $s $i) - done -fi - -# replace framework links -declare -a BROKEN_FRAMEWORKS; -k=0; -BUILD_FRAMEWORKS_FOLDER_PATH="$BUILD_FOLDER_PATH/Frameworks" -for j in $(find ${BUILD_FRAMEWORKS_FOLDER_PATH} -name Qt*.framework); do - BROKEN_FRAMEWORKS[${k}]=$j - ((k=k+1)) -done -for i in "${BROKEN_FRAMEWORKS[@]}"; do - FRAMEWORK_FILE=$i/$(basename -s ".framework" $i) - otool -L $FRAMEWORK_FILE | grep -o /usr/.*Qt.*framework/\\w* | while read -a libs ; do - install_name_tool -change ${libs[0]} @loader_path/../../../`basename ${libs[0]}`.framework/`basename ${libs[0]}` $FRAMEWORK_FILE - done -done - -declare -a BROKEN_PLUGINS; -k=0; -BUILD_PLUGINS_FOLDER_PATH="$BUILD_FOLDER_PATH/PlugIns" -for j in $(find ${BUILD_PLUGINS_FOLDER_PATH} -name *.dylib); do - BROKEN_PLUGINS[${k}]=$j - ((k=k+1)) -done -for i in "${BROKEN_PLUGINS[@]}"; do - FRAMEWORK_FILE=$i - otool -L $FRAMEWORK_FILE | grep -o /usr/.*Qt.*framework/\\w* | while read -a libs ; do - install_name_tool -change ${libs[0]} @loader_path/../../Frameworks/`basename ${libs[0]}`.framework/`basename ${libs[0]}` $FRAMEWORK_FILE - done -done - diff --git a/cmake/scripts/resource.hpp.in b/cmake/scripts/resource.hpp.in deleted file mode 100644 index 6a9740616..000000000 --- a/cmake/scripts/resource.hpp.in +++ /dev/null @@ -1,30 +0,0 @@ -// this file is autogenerated, do not modify!!! -#pragma once - -#include -#include - -namespace dev -{ -namespace eth -{ - -class ${ETH_RESOURCE_NAME} -{ -public: - ${ETH_RESOURCE_NAME}() - { -${ETH_RESULT_DATA} -${ETH_RESULT_INIT} - } - - std::string loadResourceAsString(std::string _name) { return std::string(m_resources[_name], m_sizes[_name]); } - -private: - std::map m_resources; - std::map m_sizes; -}; - -} -} - diff --git a/cmake/scripts/resources.cmake b/cmake/scripts/resources.cmake deleted file mode 100644 index b0cadbf6d..000000000 --- a/cmake/scripts/resources.cmake +++ /dev/null @@ -1,57 +0,0 @@ -# based on: http://stackoverflow.com/questions/11813271/embed-resources-eg-shader-code-images-into-executable-library-with-cmake -# -# example: -# cmake -DETH_RES_FILE=test.cmake -P resources.cmake -# -# where test.cmake is: -# -# # BEGIN OF cmake.test -# -# set(copydlls "copydlls.cmake") -# set(conf "configure.cmake") -# -# # this three properties must be set! -# -# set(ETH_RESOURCE_NAME "EthResources") -# set(ETH_RESOURCE_LOCATION "${CMAKE_CURRENT_SOURCE_DIR}") -# set(ETH_RESOURCES "copydlls" "conf") -# -# # END of cmake.test -# - -# should define ETH_RESOURCES -include(${ETH_RES_FILE}) - -set(ETH_RESULT_DATA "") -set(ETH_RESULT_INIT "") - -# resource is a name visible for cpp application -foreach(resource ${ETH_RESOURCES}) - - # filename is the name of file which will be used in app - set(filename ${${resource}}) - - # filedata is a file content - file(READ ${filename} filedata HEX) - - # read full name of the file - file(GLOB filename ${filename}) - - # Convert hex data for C compatibility - string(REGEX REPLACE "([0-9a-f][0-9a-f])" "0x\\1," filedata ${filedata}) - - # append static variables to result variable - set(ETH_RESULT_DATA "${ETH_RESULT_DATA} static const unsigned char eth_${resource}[] = {\n // ${filename}\n ${filedata}\n};\n") - - # append init resources - set(ETH_RESULT_INIT "${ETH_RESULT_INIT} m_resources[\"${resource}\"] = (char const*)eth_${resource};\n") - set(ETH_RESULT_INIT "${ETH_RESULT_INIT} m_sizes[\"${resource}\"] = sizeof(eth_${resource});\n") - -endforeach(resource) - -set(ETH_DST_NAME "${ETH_RESOURCE_LOCATION}/${ETH_RESOURCE_NAME}") - -configure_file("${CMAKE_CURRENT_LIST_DIR}/resource.hpp.in" "${ETH_DST_NAME}.hpp.tmp") - -include("${CMAKE_CURRENT_LIST_DIR}/../EthUtils.cmake") -replace_if_different("${ETH_DST_NAME}.hpp.tmp" "${ETH_DST_NAME}.hpp") From 54b4783e39d7594ba3a1613fcdf1f956478a7700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Mon, 24 Apr 2017 03:01:57 +0200 Subject: [PATCH 5/5] Add missing ProjectJsonRpcCpp.cmake file --- cmake/ProjectJsonRpcCpp.cmake | 81 +++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 cmake/ProjectJsonRpcCpp.cmake diff --git a/cmake/ProjectJsonRpcCpp.cmake b/cmake/ProjectJsonRpcCpp.cmake new file mode 100644 index 000000000..2821e9ba6 --- /dev/null +++ b/cmake/ProjectJsonRpcCpp.cmake @@ -0,0 +1,81 @@ +# HTTP client from JSON RPC CPP requires curl library. It can find it itself, +# but we need to know the libcurl location for static linking. +hunter_add_package(CURL) +find_package(CURL CONFIG REQUIRED) + +get_target_property(JSONCPP_INCLUDE_DIR jsoncpp_lib_static INTERFACE_INCLUDE_DIRECTORIES) +get_target_property(CURL_INCLUDE_DIR CURL::libcurl INTERFACE_INCLUDE_DIRECTORIES) +get_target_property(CURL_LIBRARY CURL::libcurl IMPORTED_LOCATION_RELEASE) + +set(CMAKE_ARGS -DCMAKE_INSTALL_PREFIX= + -DCMAKE_BUILD_TYPE=Release + # Build static lib but suitable to be included in a shared lib. + -DCMAKE_POSITION_INDEPENDENT_CODE=${BUILD_SHARED_LIBS} + -DBUILD_STATIC_LIBS=On + -DBUILD_SHARED_LIBS=Off + -DUNIX_DOMAIN_SOCKET_SERVER=Off + -DUNIX_DOMAIN_SOCKET_CLIENT=Off + -DHTTP_SERVER=Off + -DHTTP_CLIENT=On + -DCOMPILE_TESTS=Off + -DCOMPILE_STUBGEN=Off + -DCOMPILE_EXAMPLES=Off + # Point to jsoncpp library. + -DJSONCPP_INCLUDE_DIR=${JSONCPP_INCLUDE_DIR} + # Select jsoncpp include prefix: or + -DJSONCPP_INCLUDE_PREFIX=json + -DJSONCPP_LIBRARY=${JSONCPP_LIBRARY} + -DCURL_INCLUDE_DIR=${CURL_INCLUDE_DIR} + -DCURL_LIBRARY=${CURL_LIBRARY} +) + +if (WIN32) + # For Windows we have to provide also locations for debug libraries. + set(CMAKE_ARGS ${CMAKE_ARGS} + -DJSONCPP_LIBRARY_DEBUG=${JSONCPP_LIBRARY} + -DCURL_LIBRARY_DEBUG=${CURL_LIBRARY} + ) +endif() + +include(ExternalProject) +ExternalProject_Add(jsonrpccpp + PREFIX deps + DOWNLOAD_NAME jsonrcpcpp-0.7.0.tar.gz + DOWNLOAD_NO_PROGRESS 1 + URL https://github.com/cinemast/libjson-rpc-cpp/archive/v0.7.0.tar.gz + URL_HASH SHA256=669c2259909f11a8c196923a910f9a16a8225ecc14e6c30e2bcb712bab9097eb + # On Windows it tries to install this dir. Create it to prevent failure. + PATCH_COMMAND ${CMAKE_COMMAND} -E make_directory /win32-deps/include + CMAKE_ARGS ${CMAKE_ARGS} +# LOG_CONFIGURE 1 + # Overwrite build and install commands to force Release build on MSVC. +# BUILD_COMMAND ${CMAKE_COMMAND} --build --config Release +# INSTALL_COMMAND ${CMAKE_COMMAND} --build --config Release --target install +# LOG_INSTALL 1 +) + +# Create imported libraries +if (WIN32) + # On Windows CMAKE_INSTALL_PREFIX is ignored and installs to dist dir. + ExternalProject_Get_Property(jsonrpccpp BINARY_DIR) + set(INSTALL_DIR ${BINARY_DIR}/dist) +else() + ExternalProject_Get_Property(jsonrpccpp INSTALL_DIR) +endif() +set(JSONRPCCPP_INCLUDE_DIR ${INSTALL_DIR}/include) +file(MAKE_DIRECTORY ${JSONRPCCPP_INCLUDE_DIR}) # Must exist. + +add_library(JsonRpcCpp::Common STATIC IMPORTED) +set_property(TARGET JsonRpcCpp::Common PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}jsonrpccpp-common${CMAKE_STATIC_LIBRARY_SUFFIX}) +set_property(TARGET JsonRpcCpp::Common PROPERTY INTERFACE_LINK_LIBRARIES jsoncpp_lib_static) +set_property(TARGET JsonRpcCpp::Common PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${JSONRPCCPP_INCLUDE_DIR}) +add_dependencies(JsonRpcCpp::Common jsonrpccpp) + +add_library(JsonRpcCpp::Client STATIC IMPORTED) +set_property(TARGET JsonRpcCpp::Client PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}jsonrpccpp-client${CMAKE_STATIC_LIBRARY_SUFFIX}) +set_property(TARGET JsonRpcCpp::Client PROPERTY INTERFACE_LINK_LIBRARIES JsonRpcCpp::Common CURL::libcurl) +add_dependencies(JsonRpcCpp::Client jsonrpccpp) + +unset(BINARY_DIR) +unset(INSTALL_DIR) +unset(CMAKE_ARGS)