Merge branch 'develop' into x64

10 years ago · 20d3a0246e
2 changed files with 4 additions and 4 deletions
--- 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})
--- 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)