Skip to content
This repository has been archived by the owner on Apr 24, 2022. It is now read-only.

various build fixes for boost, json, pthread #2377

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
4 changes: 4 additions & 0 deletions cmake/EthCompilerSettings.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion libpoolprotocols/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 ..)