From 278b4be207fca550f836cdb0fbaea0760233e894 Mon Sep 17 00:00:00 2001 From: subtly Date: Sat, 25 Jul 2015 05:24:01 -0400 Subject: [PATCH] re-disable secp256k1 for windows --- CMakeLists.txt | 6 ++++-- libdevcrypto/CMakeLists.txt | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d92ee90a..00e686422 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -405,8 +405,10 @@ if (JSCONSOLE) add_subdirectory(ethconsole) endif () -add_definitions(-DETH_HAVE_SECP256K1) -add_subdirectory(secp256k1) +if (NOT WIN32) + add_definitions(-DETH_HAVE_SECP256K1) + add_subdirectory(secp256k1) +endif () add_subdirectory(libscrypt) add_subdirectory(libdevcrypto) diff --git a/libdevcrypto/CMakeLists.txt b/libdevcrypto/CMakeLists.txt index 4eb06485f..4244d95ca 100644 --- a/libdevcrypto/CMakeLists.txt +++ b/libdevcrypto/CMakeLists.txt @@ -24,8 +24,10 @@ target_link_libraries(${EXECUTABLE} ${DB_LIBRARIES}) target_link_libraries(${EXECUTABLE} ${CRYPTOPP_LIBRARIES}) target_link_libraries(${EXECUTABLE} scrypt) target_link_libraries(${EXECUTABLE} devcore) -add_definitions(-DETH_HAVE_SECP256K1) -target_link_libraries(${EXECUTABLE} secp256k1) +if (NOT WIN32) + add_definitions(-DETH_HAVE_SECP256K1) + target_link_libraries(${EXECUTABLE} secp256k1) +endif () install( TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib ) install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} )