From 592e60ec1742749ae4d81e8b24e472bcbe88582f Mon Sep 17 00:00:00 2001 From: ethdev Date: Mon, 15 Dec 2014 18:19:58 +0100 Subject: [PATCH 1/7] start of implementing windows debug --- cmake/EthDependencies.cmake | 4 ++++ libdevcore/CMakeLists.txt | 8 ++++---- solc/CMakeLists.txt | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/cmake/EthDependencies.cmake b/cmake/EthDependencies.cmake index ee93a5311..7ff225594 100644 --- a/cmake/EthDependencies.cmake +++ b/cmake/EthDependencies.cmake @@ -141,6 +141,10 @@ find_package(Boost 1.54.0 REQUIRED COMPONENTS thread date_time system regex chro message(" - boost header: ${Boost_INCLUDE_DIRS}") message(" - boost lib : ${Boost_LIBRARIES}") +message("debug ${Boost_SYSTEM_LIBRARY_DEBUG}") +message("release ${Boost_SYSTEM_LIBRARY_RELEASE}") +message("other ${Boost_SYSTEM_LIBRARY}") + if (APPLE) link_directories(/usr/local/lib) include_directories(/usr/local/include) diff --git a/libdevcore/CMakeLists.txt b/libdevcore/CMakeLists.txt index 001c568b5..ce8abcbb3 100644 --- a/libdevcore/CMakeLists.txt +++ b/libdevcore/CMakeLists.txt @@ -25,10 +25,10 @@ else() add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS}) endif() -target_link_libraries(${EXECUTABLE} ${Boost_THREAD_LIBRARY_RELEASE}) -target_link_libraries(${EXECUTABLE} ${Boost_DATE_TIME_LIBRARY_RELEASE}) -target_link_libraries(${EXECUTABLE} ${Boost_SYSTEM_LIBRARY_RELEASE}) -target_link_libraries(${EXECUTABLE} ${Boost_CHRONO_LIBRARY_RELEASE}) +target_link_libraries(${EXECUTABLE} ${Boost_THREAD_LIBRARY}) +target_link_libraries(${EXECUTABLE} ${Boost_DATE_TIME_LIBRARY}) +target_link_libraries(${EXECUTABLE} ${Boost_SYSTEM_LIBRARY}) +target_link_libraries(${EXECUTABLE} ${Boost_CHRONO_LIBRARY}) if (APPLE) find_package(Threads REQUIRED) diff --git a/solc/CMakeLists.txt b/solc/CMakeLists.txt index cf1e42572..bc8632373 100644 --- a/solc/CMakeLists.txt +++ b/solc/CMakeLists.txt @@ -11,8 +11,8 @@ set(EXECUTABLE solc) file(GLOB HEADERS "*.h") add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) -target_link_libraries(${EXECUTABLE} ${Boost_FILESYSTEM_LIBRARY_RELEASE}) -target_link_libraries(${EXECUTABLE} ${Boost_PROGRAM_OPTIONS_LIBRARY_RELEASE}) +target_link_libraries(${EXECUTABLE} ${Boost_FILESYSTEM_LIBRARY}) +target_link_libraries(${EXECUTABLE} ${Boost_PROGRAM_OPTIONS_LIBRARY}) target_link_libraries(${EXECUTABLE} solidity) install( TARGETS ${EXECUTABLE} DESTINATION bin ) From 708d5536aec6c678cda52595d3d08a810cd0eb9d Mon Sep 17 00:00:00 2001 From: Marek Kotewicz Date: Mon, 15 Dec 2014 18:42:53 +0100 Subject: [PATCH 2/7] modyfied findjsoncpp cmake to look for debug library --- cmake/FindJsoncpp.cmake | 138 ++++++++++++---------------------------- 1 file changed, 41 insertions(+), 97 deletions(-) diff --git a/cmake/FindJsoncpp.cmake b/cmake/FindJsoncpp.cmake index fe72a9042..c2f0aca43 100644 --- a/cmake/FindJsoncpp.cmake +++ b/cmake/FindJsoncpp.cmake @@ -1,103 +1,47 @@ -# - try to find JSONCPP library +# Find jsoncpp # -# Cache Variables: (probably not for direct use in your scripts) -# JSONCPP_INCLUDE_DIR -# JSONCPP_LIBRARY -# -# Non-cache variables you might use in your CMakeLists.txt: -# JSONCPP_FOUND -# JSONCPP_INCLUDE_DIRS -# JSONCPP_LIBRARIES -# -# Requires these CMake modules: -# FindPackageHandleStandardArgs (known included with CMake >=2.6.2) -# -# Author: -# 2011 Philippe Crassous (ENSAM ParisTech / Institut Image) p.crassous _at_ free.fr -# -# Adapted from the Virtual Reality Peripheral Network library. -# https://github.com/rpavlik/vrpn/blob/master/README.Legal -# - -set(JSONCPP_ROOT_DIR - "${JSONCPP_ROOT_DIR}" - CACHE - PATH - "Directory to search for JSONCPP") -set(_jsoncppnames) -set(_pathsuffixes - suncc - vacpp - mingw - msvc6 - msvc7 - msvc71 - msvc80 - msvc90 - linux-gcc) -if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - execute_process(COMMAND - ${CMAKE_CXX_COMPILER} - -dumpversion - OUTPUT_VARIABLE - _gnucxx_ver - OUTPUT_STRIP_TRAILING_WHITESPACE) - list(APPEND - _jsoncppnames - json_linux-gcc-${_gnucxx_ver}_libmt - json_linux-gcc_libmt) - list(APPEND _pathsuffixes linux-gcc-${_gnucxx_ver}) -elseif(MSVC) - if(MSVC_VERSION EQUAL 1200) - list(APPEND _jsoncppnames json_vc6_libmt) - elseif(MSVC_VERSION EQUAL 1300) - list(APPEND _jsoncppnames json_vc7_libmt) - elseif(MSVC_VERSION EQUAL 1310) - list(APPEND _jsoncppnames json_vc71_libmt) - elseif(MSVC_VERSION EQUAL 1400) - list(APPEND _jsoncppnames json_vc8_libmt) - elseif(MSVC_VERSION EQUAL 1500) - list(APPEND _jsoncppnames json_vc9_libmt) - elseif(MSVC_VERSION EQUAL 1600) - list(APPEND _jsoncppnames json_vc10_libmt) - endif() -else() - list(APPEND _jsoncppnames - json_suncc_libmt - json_vacpp_libmt) -endif() - -list(APPEND _jsoncppnames - json_mingw_libmt - jsoncpp) - -find_library(JSONCPP_LIBRARY - NAMES - ${_jsoncppnames} - PATHS - "${JSONCPP_ROOT_DIR}/libs" - PATH_SUFFIXES - ${_pathsuffixes}) - -find_path(JSONCPP_INCLUDE_DIR - NAMES - json/json.h - PATHS - "${JSONCPP_ROOT_DIR}" - PATH_SUFFIXES jsoncpp - include) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(JSONCPP - DEFAULT_MSG +# Find the jsoncpp includes and library +# +# if you nee to add a custom library search path, do it via via CMAKE_FIND_ROOT_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 jsoncpp/json/json.h + DOC "jsoncpp include dir" +) + +find_library( JSONCPP_LIBRARY - JSONCPP_INCLUDE_DIR) + 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) +if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") + find_library( + JSONCPP_LIBRARY_DEBUG + NAMES jsoncppd + DOC "jsoncpp debug library" + ) + + set(JSONCPP_LIBRARIES ${JSONCPP_LIBRARIES} ${JSONCPP_LIBRARY_DEBUG}) -if(JSONCPP_FOUND) - set(JSONCPP_LIBRARIES "${JSONCPP_LIBRARY}") - set(JSONCPP_INCLUDE_DIRS "${JSONCPP_INCLUDE_DIR}") - mark_as_advanced(JSONCPP_ROOT_DIR) endif() -mark_as_advanced(JSONCPP_INCLUDE_DIR JSONCPP_LIBRARY) +# handle the QUIETLY and REQUIRED arguments and set GMP_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) From f42dbcac1ccdfeaef7329214f026793d861e807d Mon Sep 17 00:00:00 2001 From: ethdev Date: Mon, 15 Dec 2014 19:01:20 +0100 Subject: [PATCH 3/7] boost library -> libraries --- cmake/EthDependencies.cmake | 4 ---- eth/CMakeLists.txt | 4 ++-- libdevcore/CMakeLists.txt | 8 ++++---- libdevcrypto/CMakeLists.txt | 2 +- libethereum/CMakeLists.txt | 2 +- solc/CMakeLists.txt | 4 ++-- test/CMakeLists.txt | 4 ++-- 7 files changed, 12 insertions(+), 16 deletions(-) diff --git a/cmake/EthDependencies.cmake b/cmake/EthDependencies.cmake index 7ff225594..ee93a5311 100644 --- a/cmake/EthDependencies.cmake +++ b/cmake/EthDependencies.cmake @@ -141,10 +141,6 @@ find_package(Boost 1.54.0 REQUIRED COMPONENTS thread date_time system regex chro message(" - boost header: ${Boost_INCLUDE_DIRS}") message(" - boost lib : ${Boost_LIBRARIES}") -message("debug ${Boost_SYSTEM_LIBRARY_DEBUG}") -message("release ${Boost_SYSTEM_LIBRARY_RELEASE}") -message("other ${Boost_SYSTEM_LIBRARY}") - if (APPLE) link_directories(/usr/local/lib) include_directories(/usr/local/include) diff --git a/eth/CMakeLists.txt b/eth/CMakeLists.txt index 739c2991c..27fd542c1 100644 --- a/eth/CMakeLists.txt +++ b/eth/CMakeLists.txt @@ -14,8 +14,8 @@ add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) add_dependencies(${EXECUTABLE} BuildInfo.h) -target_link_libraries(${EXECUTABLE} ${Boost_REGEX_LIBRARY_RELEASE}) -target_link_libraries(${EXECUTABLE} ${Boost_DATE_TIME_LIBRARY_RELEASE}) +target_link_libraries(${EXECUTABLE} ${Boost_REGEX_LIBRARIES}) +target_link_libraries(${EXECUTABLE} ${Boost_DATE_TIME_LIBRARIES}) if (READLINE_FOUND) target_link_libraries(${EXECUTABLE} ${READLINE_LIBRARIES}) diff --git a/libdevcore/CMakeLists.txt b/libdevcore/CMakeLists.txt index ce8abcbb3..df93361a4 100644 --- a/libdevcore/CMakeLists.txt +++ b/libdevcore/CMakeLists.txt @@ -25,10 +25,10 @@ else() add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS}) endif() -target_link_libraries(${EXECUTABLE} ${Boost_THREAD_LIBRARY}) -target_link_libraries(${EXECUTABLE} ${Boost_DATE_TIME_LIBRARY}) -target_link_libraries(${EXECUTABLE} ${Boost_SYSTEM_LIBRARY}) -target_link_libraries(${EXECUTABLE} ${Boost_CHRONO_LIBRARY}) +target_link_libraries(${EXECUTABLE} ${Boost_THREAD_LIBRARIES}) +target_link_libraries(${EXECUTABLE} ${Boost_DATE_TIME_LIBRARIES}) +target_link_libraries(${EXECUTABLE} ${Boost_SYSTEM_LIBRARIES}) +target_link_libraries(${EXECUTABLE} ${Boost_CHRONO_LIBRARIES}) if (APPLE) find_package(Threads REQUIRED) diff --git a/libdevcrypto/CMakeLists.txt b/libdevcrypto/CMakeLists.txt index 20eab916a..4cd6daf21 100644 --- a/libdevcrypto/CMakeLists.txt +++ b/libdevcrypto/CMakeLists.txt @@ -23,7 +23,7 @@ else() add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS}) endif() -target_link_libraries(${EXECUTABLE} ${Boost_FILESYSTEM_LIBRARY_RELEASE}) +target_link_libraries(${EXECUTABLE} ${Boost_FILESYSTEM_LIBRARIES}) target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARIES}) target_link_libraries(${EXECUTABLE} ${CRYPTOPP_LIBRARIES}) target_link_libraries(${EXECUTABLE} devcore) diff --git a/libethereum/CMakeLists.txt b/libethereum/CMakeLists.txt index 792ed0cf1..3906074fd 100644 --- a/libethereum/CMakeLists.txt +++ b/libethereum/CMakeLists.txt @@ -25,7 +25,7 @@ else() endif() target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARIES}) -target_link_libraries(${EXECUTABLE} ${Boost_REGEX_LIBRARY_RELEASE}) +target_link_libraries(${EXECUTABLE} ${Boost_REGEX_LIBRARIES}) target_link_libraries(${EXECUTABLE} evm) target_link_libraries(${EXECUTABLE} lll) diff --git a/solc/CMakeLists.txt b/solc/CMakeLists.txt index bc8632373..8c0ece27e 100644 --- a/solc/CMakeLists.txt +++ b/solc/CMakeLists.txt @@ -11,8 +11,8 @@ set(EXECUTABLE solc) file(GLOB HEADERS "*.h") add_executable(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) -target_link_libraries(${EXECUTABLE} ${Boost_FILESYSTEM_LIBRARY}) -target_link_libraries(${EXECUTABLE} ${Boost_PROGRAM_OPTIONS_LIBRARY}) +target_link_libraries(${EXECUTABLE} ${Boost_FILESYSTEM_LIBRARIES}) +target_link_libraries(${EXECUTABLE} ${Boost_PROGRAM_OPTIONS_LIBRARIES}) target_link_libraries(${EXECUTABLE} solidity) install( TARGETS ${EXECUTABLE} DESTINATION bin ) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 7e618f7ea..f862de24c 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -12,7 +12,7 @@ file(GLOB HEADERS "*.h") add_executable(testeth ${SRC_LIST} ${HEADERS}) add_executable(createRandomTest createRandomTest.cpp vm.cpp TestHelper.cpp) -target_link_libraries(testeth ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY_RELEASE}) +target_link_libraries(testeth ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES}) target_link_libraries(testeth ${CURL_LIBRARIES}) target_link_libraries(testeth ethereum) target_link_libraries(testeth ethcore) @@ -25,6 +25,6 @@ if (JSONRPC) target_link_libraries(testeth ${JSON_RPC_CPP_CLIENT_LIBRARIES}) endif() -target_link_libraries(createRandomTest ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY_RELEASE}) +target_link_libraries(createRandomTest ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES}) target_link_libraries(createRandomTest ethereum) target_link_libraries(createRandomTest ethcore) From 93d70bf9573087e5e27017188e3a306f518e2e6d Mon Sep 17 00:00:00 2001 From: Marek Kotewicz Date: Tue, 16 Dec 2014 12:25:14 +0100 Subject: [PATCH 4/7] search for leveldb debug library --- cmake/FindLevelDB.cmake | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/cmake/FindLevelDB.cmake b/cmake/FindLevelDB.cmake index 6bd373a9f..b2f59ec4d 100644 --- a/cmake/FindLevelDB.cmake +++ b/cmake/FindLevelDB.cmake @@ -25,6 +25,19 @@ find_library( set(LEVELDB_INCLUDE_DIRS ${LEVELDB_INCLUDE_DIR}) set(LEVELDB_LIBRARIES ${LEVELDB_LIBRARY}) +# debug library on windows +# same naming convention as in qt (appending debug library with d) +if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") + find_library( + LEVELDB_LIBRARY_DEBUG + NAMES leveldbd + DOC "leveldb debug library" + ) + + set(LEVELDB_LIBRARIES ${LEVELDB_LIBRARIES} ${LEVELDB_LIBRARY_DEBUG}) + +endif() + # handle the QUIETLY and REQUIRED arguments and set LEVELDB_FOUND to TRUE # if all listed variables are TRUE, hide their existence from configuration view include(FindPackageHandleStandardArgs) From a68cb3f0b8294e44c4c72e219ac61814b1843b81 Mon Sep 17 00:00:00 2001 From: ethdev Date: Tue, 16 Dec 2014 12:45:03 +0100 Subject: [PATCH 5/7] jsoncpp && leveldb are now using optimized/debug --- alethzero/CMakeLists.txt | 1 - cmake/FindJsoncpp.cmake | 3 ++- cmake/FindLevelDB.cmake | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/alethzero/CMakeLists.txt b/alethzero/CMakeLists.txt index c4237eaee..39c02d6be 100644 --- a/alethzero/CMakeLists.txt +++ b/alethzero/CMakeLists.txt @@ -32,7 +32,6 @@ eth_add_executable(${EXECUTABLE} add_dependencies(${EXECUTABLE} BuildInfo.h) target_link_libraries(${EXECUTABLE} Qt5::Core) -target_link_libraries(${EXECUTABLE} ${JSONCPP_LIBRARIES}) target_link_libraries(${EXECUTABLE} webthree) target_link_libraries(${EXECUTABLE} qethereum) target_link_libraries(${EXECUTABLE} ethereum) diff --git a/cmake/FindJsoncpp.cmake b/cmake/FindJsoncpp.cmake index c2f0aca43..392b57ffb 100644 --- a/cmake/FindJsoncpp.cmake +++ b/cmake/FindJsoncpp.cmake @@ -27,6 +27,7 @@ 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 @@ -34,7 +35,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") DOC "jsoncpp debug library" ) - set(JSONCPP_LIBRARIES ${JSONCPP_LIBRARIES} ${JSONCPP_LIBRARY_DEBUG}) + set(JSONCPP_LIBRARIES optimized ${JSONCPP_LIBRARIES} debug ${JSONCPP_LIBRARY_DEBUG}) endif() diff --git a/cmake/FindLevelDB.cmake b/cmake/FindLevelDB.cmake index b2f59ec4d..a4aef1705 100644 --- a/cmake/FindLevelDB.cmake +++ b/cmake/FindLevelDB.cmake @@ -27,6 +27,7 @@ set(LEVELDB_LIBRARIES ${LEVELDB_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( LEVELDB_LIBRARY_DEBUG @@ -34,7 +35,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") DOC "leveldb debug library" ) - set(LEVELDB_LIBRARIES ${LEVELDB_LIBRARIES} ${LEVELDB_LIBRARY_DEBUG}) + set(LEVELDB_LIBRARIES optimized ${LEVELDB_LIBRARIES} debug ${LEVELDB_LIBRARY_DEBUG}) endif() From e2223b8057e40a3af5a79c2df7f48a7674bc2cb5 Mon Sep 17 00:00:00 2001 From: ethdev Date: Tue, 16 Dec 2014 15:31:34 +0100 Subject: [PATCH 6/7] missing boost include in eth --- eth/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/eth/CMakeLists.txt b/eth/CMakeLists.txt index 27fd542c1..c98f3cbec 100644 --- a/eth/CMakeLists.txt +++ b/eth/CMakeLists.txt @@ -3,6 +3,7 @@ set(CMAKE_AUTOMOC OFF) aux_source_directory(. SRC_LIST) +include_directories(${Boost_INCLUDE_DIRS}) include_directories(${JSON_RPC_CPP_INCLUDE_DIRS}) include_directories(..) From 0532223f516a8853bfd90e38bcdd51d2fa27e39b Mon Sep 17 00:00:00 2001 From: Marek Kotewicz Date: Tue, 16 Dec 2014 16:03:23 +0100 Subject: [PATCH 7/7] fixed typo --- cmake/FindGmp.cmake | 2 +- cmake/FindJsonRpcCpp.cmake | 2 +- cmake/FindJsoncpp.cmake | 4 ++-- cmake/FindLevelDB.cmake | 2 +- cmake/FindMiniupnpc.cmake | 2 +- cmake/FindReadline.cmake | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmake/FindGmp.cmake b/cmake/FindGmp.cmake index 4dc8f48c4..1cffa7efa 100644 --- a/cmake/FindGmp.cmake +++ b/cmake/FindGmp.cmake @@ -2,7 +2,7 @@ # # Find the gmp includes and library # -# if you nee to add a custom library search path, do it via via CMAKE_FIND_ROOT_PATH +# if you nee to add a custom library search path, do it via via CMAKE_PREFIX_PATH # # This module defines # GMP_INCLUDE_DIRS, where to find header, etc. diff --git a/cmake/FindJsonRpcCpp.cmake b/cmake/FindJsonRpcCpp.cmake index eecf518f8..3072ff244 100644 --- a/cmake/FindJsonRpcCpp.cmake +++ b/cmake/FindJsonRpcCpp.cmake @@ -2,7 +2,7 @@ # # Find the json-rpc-cpp includes and library # -# if you nee to add a custom library search path, do it via via CMAKE_FIND_ROOT_PATH +# 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. diff --git a/cmake/FindJsoncpp.cmake b/cmake/FindJsoncpp.cmake index 392b57ffb..36ba12a3e 100644 --- a/cmake/FindJsoncpp.cmake +++ b/cmake/FindJsoncpp.cmake @@ -2,7 +2,7 @@ # # Find the jsoncpp includes and library # -# if you nee to add a custom library search path, do it via via CMAKE_FIND_ROOT_PATH +# 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. @@ -39,7 +39,7 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") endif() -# handle the QUIETLY and REQUIRED arguments and set GMP_FOUND to TRUE +# 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 diff --git a/cmake/FindLevelDB.cmake b/cmake/FindLevelDB.cmake index a4aef1705..b1a9a5815 100644 --- a/cmake/FindLevelDB.cmake +++ b/cmake/FindLevelDB.cmake @@ -2,7 +2,7 @@ # # Find the leveldb includes and library # -# if you nee to add a custom library search path, do it via via CMAKE_FIND_ROOT_PATH +# if you nee to add a custom library search path, do it via via CMAKE_PREFIX_PATH # # This module defines # LEVELDB_INCLUDE_DIRS, where to find header, etc. diff --git a/cmake/FindMiniupnpc.cmake b/cmake/FindMiniupnpc.cmake index 4ecbb0c4a..1438a8526 100644 --- a/cmake/FindMiniupnpc.cmake +++ b/cmake/FindMiniupnpc.cmake @@ -2,7 +2,7 @@ # # Find the miniupnpc includes and library # -# if you nee to add a custom library search path, do it via via CMAKE_FIND_ROOT_PATH +# if you nee to add a custom library search path, do it via via CMAKE_PREFIX_PATH # # This module defines # MINIUPNPC_INCLUDE_DIRS, where to find header, etc. diff --git a/cmake/FindReadline.cmake b/cmake/FindReadline.cmake index 1f47db4a7..c1cdfd33a 100644 --- a/cmake/FindReadline.cmake +++ b/cmake/FindReadline.cmake @@ -2,7 +2,7 @@ # # Find the readline includes and library # -# if you nee to add a custom library search path, do it via via CMAKE_FIND_ROOT_PATH +# if you nee to add a custom library search path, do it via via CMAKE_PREFIX_PATH # # This module defines # READLINE_INCLUDE_DIRS, where to find header, etc.