diff --git a/ethminer/CMakeLists.txt b/ethminer/CMakeLists.txt index 99ad003a06..98e8acfea0 100644 --- a/ethminer/CMakeLists.txt +++ b/ethminer/CMakeLists.txt @@ -3,6 +3,8 @@ cmake_policy(SET CMP0015 NEW) aux_source_directory(. SRC_LIST) include_directories(BEFORE ..) +include_directories(${jsoncpp_INCLUDE_DIR}) +include_directories(${OpenCL_INCLUDE_DIR}) set(EXECUTABLE ethminer) diff --git a/libapicore/CMakeLists.txt b/libapicore/CMakeLists.txt index 19172dd432..f52d3dd111 100644 --- a/libapicore/CMakeLists.txt +++ b/libapicore/CMakeLists.txt @@ -5,3 +5,4 @@ set(SOURCES add_library(apicore ${SOURCES}) target_link_libraries(apicore PRIVATE ethcore devcore ethminer-buildinfo Boost::filesystem) target_include_directories(apicore PRIVATE ..) +include_directories(${jsoncpp_INCLUDE_DIR}) diff --git a/libethash-cl/CMakeLists.txt b/libethash-cl/CMakeLists.txt index f190b97ba6..41c650a5a1 100644 --- a/libethash-cl/CMakeLists.txt +++ b/libethash-cl/CMakeLists.txt @@ -29,6 +29,8 @@ else() endif() include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(${jsoncpp_INCLUDE_DIR}) +include_directories(${OpenCL_INCLUDE_DIR}) include_directories(..) add_library(ethash-cl ${SOURCES}) diff --git a/libethcore/CMakeLists.txt b/libethcore/CMakeLists.txt index 1a53de8d53..cb5cd08297 100644 --- a/libethcore/CMakeLists.txt +++ b/libethcore/CMakeLists.txt @@ -5,6 +5,8 @@ set(SOURCES ) include_directories(BEFORE ..) +include_directories(${jsoncpp_INCLUDE_DIR}) +include_directories(${OpenCL_INCLUDE_DIR}) add_library(ethcore ${SOURCES}) target_link_libraries(ethcore PUBLIC devcore ethash::ethash PRIVATE hwmon) diff --git a/libethcore/Farm.cpp b/libethcore/Farm.cpp index 92478cf646..047013304e 100644 --- a/libethcore/Farm.cpp +++ b/libethcore/Farm.cpp @@ -382,7 +382,7 @@ void Farm::restart() */ void Farm::restart_async() { - m_io_strand.get_io_service().post(m_io_strand.wrap(boost::bind(&Farm::restart, this))); + m_io_strand.context().post(m_io_strand.wrap(boost::bind(&Farm::restart, this))); } /** diff --git a/libpoolprotocols/CMakeLists.txt b/libpoolprotocols/CMakeLists.txt index f7ef3bca80..114566e923 100644 --- a/libpoolprotocols/CMakeLists.txt +++ b/libpoolprotocols/CMakeLists.txt @@ -11,5 +11,6 @@ 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_lib OpenSSL::SSL OpenSSL::Crypto) target_include_directories(poolprotocols PRIVATE ..) +include_directories(${jsoncpp_INCLUDE_DIR}) diff --git a/libpoolprotocols/getwork/EthGetworkClient.cpp b/libpoolprotocols/getwork/EthGetworkClient.cpp index 227f7b98eb..3bc0f9302c 100644 --- a/libpoolprotocols/getwork/EthGetworkClient.cpp +++ b/libpoolprotocols/getwork/EthGetworkClient.cpp @@ -7,6 +7,7 @@ using namespace std; using namespace dev; using namespace eth; +using namespace boost::placeholders; using boost::asio::ip::tcp; diff --git a/libpoolprotocols/stratum/EthStratumClient.h b/libpoolprotocols/stratum/EthStratumClient.h index fa599c7396..7e1197dd42 100644 --- a/libpoolprotocols/stratum/EthStratumClient.h +++ b/libpoolprotocols/stratum/EthStratumClient.h @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include #include