diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a2a07a7f2..ceaa6c7d9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,8 +14,8 @@ cable_configure_toolchain(DEFAULT cxx11) set(HUNTER_CONFIGURATION_TYPES Release CACHE STRING "Build type of Hunter packages") set(HUNTER_JOBS_NUMBER 6 CACHE STRING "Number of parallel builds used by Hunter") HunterGate( - URL "https://github.com/ruslo/hunter/archive/v0.23.112.tar.gz" - SHA1 "4b894e1d5d203f0cc9a77431dbb1b486ab6f4430" + URL "https://github.com/cpp-pm/hunter/archive/v0.23.315.tar.gz" + SHA1 "ea5d72afc0df67f2126e7fd069f20c5f723709e1" LOCAL ) diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake index a4aa3477c7..734a94eb2a 100644 --- a/cmake/EthCompilerSettings.cmake +++ b/cmake/EthCompilerSettings.cmake @@ -11,6 +11,8 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") eth_add_cxx_compiler_flag_if_supported(-fdata-sections) eth_add_cxx_linker_flag_if_supported(-Wl,--gc-sections) + eth_add_cxx_linker_flag_if_supported(-pthread) + elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unknown-pragmas -Wextra") @@ -19,6 +21,8 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") eth_add_cxx_compiler_flag_if_supported(-fdata-sections) eth_add_cxx_linker_flag_if_supported(-Wl,--gc-sections) + eth_add_cxx_linker_flag_if_supported(-pthread) + if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libstdc++ -fcolor-diagnostics -Qunused-arguments") endif() diff --git a/libpoolprotocols/CMakeLists.txt b/libpoolprotocols/CMakeLists.txt index f7ef3bca80..907c6c781d 100644 --- a/libpoolprotocols/CMakeLists.txt +++ b/libpoolprotocols/CMakeLists.txt @@ -11,5 +11,5 @@ hunter_add_package(OpenSSL) find_package(OpenSSL REQUIRED) add_library(poolprotocols ${SOURCES}) -target_link_libraries(poolprotocols PRIVATE devcore ethminer-buildinfo ethash::ethash Boost::system jsoncpp_lib_static OpenSSL::SSL OpenSSL::Crypto) +target_link_libraries(poolprotocols PRIVATE devcore ethminer-buildinfo ethash::ethash Boost::system jsoncpp_static OpenSSL::SSL OpenSSL::Crypto) target_include_directories(poolprotocols PRIVATE ..)