From 37e0f18129b3a5846df73a53ea0faa03bd69685f Mon Sep 17 00:00:00 2001 From: Marek Kotewicz Date: Tue, 14 Apr 2015 21:45:13 +0200 Subject: [PATCH 1/2] ethashcl optional --- libethcore/CMakeLists.txt | 5 ++++- libethereum/CMakeLists.txt | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libethcore/CMakeLists.txt b/libethcore/CMakeLists.txt index c425c444d..6ef7b928c 100644 --- a/libethcore/CMakeLists.txt +++ b/libethcore/CMakeLists.txt @@ -28,7 +28,10 @@ endif() target_link_libraries(${EXECUTABLE} ethash) target_link_libraries(${EXECUTABLE} devcrypto) target_link_libraries(${EXECUTABLE} devcore) -target_link_libraries(${EXECUTABLE} ethash-cl) + +if (ETHASHCL) + target_link_libraries(${EXECUTABLE} ethash-cl) +endif () if (CPUID_FOUND) target_link_libraries(${EXECUTABLE} ${CPUID_LIBRARIES}) diff --git a/libethereum/CMakeLists.txt b/libethereum/CMakeLists.txt index 362713663..1d0911909 100644 --- a/libethereum/CMakeLists.txt +++ b/libethereum/CMakeLists.txt @@ -34,9 +34,6 @@ target_link_libraries(${EXECUTABLE} ethcore) target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARIES}) target_link_libraries(${EXECUTABLE} ${Boost_REGEX_LIBRARIES}) target_link_libraries(${EXECUTABLE} secp256k1) -if (ETHASHCL) - target_link_libraries(${EXECUTABLE} ethash-cl) -endif () if (CMAKE_COMPILER_IS_MINGW) target_link_libraries(${EXECUTABLE} ssp shlwapi) From 599f8d1c8047a62ffc343c40969f2a40663e9129 Mon Sep 17 00:00:00 2001 From: Marek Kotewicz Date: Tue, 14 Apr 2015 21:49:43 +0200 Subject: [PATCH 2/2] eth do not need ethash-cl --- eth/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/eth/CMakeLists.txt b/eth/CMakeLists.txt index 557707f62..fbc6a8b24 100644 --- a/eth/CMakeLists.txt +++ b/eth/CMakeLists.txt @@ -27,7 +27,6 @@ endif() target_link_libraries(${EXECUTABLE} webthree) target_link_libraries(${EXECUTABLE} ethash) -target_link_libraries(${EXECUTABLE} ethash-cl) if (DEFINED WIN32 AND NOT DEFINED CMAKE_COMPILER_IS_MINGW) add_custom_command(TARGET ${EXECUTABLE} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy ${MHD_DLL_RELEASE} "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}")