Skip to content
This repository has been archived by the owner on Oct 28, 2021. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Update deps: build Crypto++ from source
  • Loading branch information
chfast committed Jan 5, 2017
1 parent fabb60d commit 54f5749
Show file tree
Hide file tree
Showing 9 changed files with 3 additions and 129 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Expand Up @@ -44,6 +44,7 @@ include(EthOptions)

include(deps/jsoncpp.cmake)
include(deps/jsonrpc.cmake)
include(deps/cryptopp.cmake)

configure_project(CPUID CURL ETHASHCL EVMJIT FATDB MINIUPNPC ROCKSDB PARANOID TESTS VMTRACE)

Expand Down
108 changes: 0 additions & 108 deletions cmake/FindCryptoPP.cmake

This file was deleted.

10 changes: 0 additions & 10 deletions cmake/UseCryptopp.cmake

This file was deleted.

2 changes: 1 addition & 1 deletion deps
Submodule deps updated 2 files
+1 −0 .gitignore
+48 −0 cryptopp.cmake
3 changes: 1 addition & 2 deletions libdevcrypto/CMakeLists.txt
Expand Up @@ -5,15 +5,14 @@ file(GLOB HEADERS "*.h")
add_library(devcrypto ${SRC_LIST} ${HEADERS})
add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)

eth_use(devcrypto REQUIRED Cryptopp)

find_package(Dev)
find_package(Utils)

target_include_directories(devcrypto PRIVATE ..)
target_include_directories(devcrypto PRIVATE ../utils)
target_link_libraries(devcrypto ${Dev_DEVCORE_LIBRARIES})
target_link_libraries(devcrypto ${Utils_SCRYPT_LIBRARIES})
target_link_libraries(devcrypto cryptopp)

if (NOT EMSCRIPTEN)
target_link_libraries(devcrypto ${Utils_SECP256K1_LIBRARIES})
Expand Down
4 changes: 0 additions & 4 deletions libethash/CMakeLists.txt
Expand Up @@ -25,10 +25,6 @@ else()
list(APPEND FILES io_posix.c)
endif()

if (NOT CRYPTOPP_FOUND)
find_package(CryptoPP 5.6.2)
endif()

list(APPEND FILES sha3.c sha3.h)

add_library(ethash ${FILES})
Expand Down
1 change: 0 additions & 1 deletion libp2p/CMakeLists.txt
Expand Up @@ -6,7 +6,6 @@ file(GLOB HEADERS "*.h")

add_library(p2p ${SRC_LIST} ${HEADERS})

eth_use(p2p REQUIRED Cryptopp)
eth_use(p2p OPTIONAL Miniupnpc)

find_package(Dev)
Expand Down
2 changes: 0 additions & 2 deletions rlp/CMakeLists.txt
Expand Up @@ -2,8 +2,6 @@ aux_source_directory(. SRC_LIST)

add_executable(rlp ${SRC_LIST})

eth_use(rlp REQUIRED Cryptopp)

if (NOT EMSCRIPTEN AND NOT MSVC)
eth_use(rlp ${REQUIRED} Utils::secp256k1)
endif()
Expand Down
1 change: 0 additions & 1 deletion test/CMakeLists.txt
Expand Up @@ -50,7 +50,6 @@ find_package(Eth)
find_package(Web3)

target_include_directories(testeth PRIVATE ..)
target_include_directories(testeth PRIVATE ../..)
target_include_directories(testeth PRIVATE ../utils)

target_link_libraries(testeth ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
Expand Down

0 comments on commit 54f5749

Please sign in to comment.