diff --git a/cmake/EthDependencies.cmake b/cmake/EthDependencies.cmake index f5fdae74f..10fd84a2b 100644 --- a/cmake/EthDependencies.cmake +++ b/cmake/EthDependencies.cmake @@ -41,7 +41,7 @@ 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. -find_package (CryptoPP 5.6.2 EXACT REQUIRED) +find_package (CryptoPP 5.6.2 REQUIRED) message(" - CryptoPP header: ${CRYPTOPP_INCLUDE_DIRS}") message(" - CryptoPP lib : ${CRYPTOPP_LIBRARIES}") diff --git a/libethash-cuda/CMakeLists.txt b/libethash-cuda/CMakeLists.txt index c7bdc0923..e96027bf7 100644 --- a/libethash-cuda/CMakeLists.txt +++ b/libethash-cuda/CMakeLists.txt @@ -5,7 +5,7 @@ FIND_PACKAGE(CUDA REQUIRED) file(GLOB SRC_LIST "*.cpp" "*.cu") file(GLOB HEADERS "*.h" "*.cuh") -set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS};--std=c++11;--disable-warnings;--ptxas-options=-v;-use_fast_math;-lineinfo) +set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS};--disable-warnings;--ptxas-options=-v;-use_fast_math;-lineinfo) LIST(APPEND CUDA_NVCC_FLAGS_RELEASE -O3) LIST(APPEND CUDA_NVCC_FLAGS_DEBUG -G) @@ -25,4 +25,4 @@ CUDA_ADD_LIBRARY(${EXECUTABLE} STATIC ${SRC_LIST} ${HEADERS}) TARGET_LINK_LIBRARIES(${EXECUTABLE} ${CUDA_LIBRARIES} ethash) install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib ) -install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} ) \ No newline at end of file +install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} ) diff --git a/libethcore/Ethash.cpp b/libethcore/Ethash.cpp index 6026828dc..211b6896a 100644 --- a/libethcore/Ethash.cpp +++ b/libethcore/Ethash.cpp @@ -111,7 +111,7 @@ void Ethash::BlockHeaderRaw::verifyParent(BlockHeaderRaw const& _parent) if (m_gasLimit < c_minGasLimit || m_gasLimit <= _parent.m_gasLimit - _parent.m_gasLimit / c_gasLimitBoundDivisor || m_gasLimit >= _parent.m_gasLimit + _parent.m_gasLimit / c_gasLimitBoundDivisor) - BOOST_THROW_EXCEPTION(InvalidGasLimit() << errinfo_min((bigint)_parent.m_gasLimit - _parent.m_gasLimit / c_gasLimitBoundDivisor) << errinfo_got((bigint)m_gasLimit) << errinfo_max((bigint)_parent.m_gasLimit + _parent.m_gasLimit / c_gasLimitBoundDivisor)); + BOOST_THROW_EXCEPTION(InvalidGasLimit() << errinfo_min((bigint)(_parent.m_gasLimit - _parent.m_gasLimit / c_gasLimitBoundDivisor)) << errinfo_got((bigint)m_gasLimit) << errinfo_max((bigint)(_parent.m_gasLimit + _parent.m_gasLimit / c_gasLimitBoundDivisor))); } void Ethash::BlockHeaderRaw::populateFromParent(BlockHeaderRaw const& _parent)