From a0c1bd0f147620ec92855dd5aff1d41c9eb2efa4 Mon Sep 17 00:00:00 2001 From: Colin LeMahieu Date: Wed, 27 Sep 2023 15:25:14 +0100 Subject: [PATCH] Fix link order between ed25519 and needed symbols in interface.cpp --- nano/crypto_lib/CMakeLists.txt | 11 +++++++---- nano/lib/CMakeLists.txt | 1 - 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/nano/crypto_lib/CMakeLists.txt b/nano/crypto_lib/CMakeLists.txt index 99910faac3..533412cdff 100644 --- a/nano/crypto_lib/CMakeLists.txt +++ b/nano/crypto_lib/CMakeLists.txt @@ -1,5 +1,8 @@ -add_library( - crypto_lib interface.cpp random_pool.hpp random_pool.cpp - random_pool_shuffle.hpp secure_memory.hpp secure_memory.cpp) +add_library(nano_ed25519 interface.cpp) -target_link_libraries(crypto_lib blake2 ${CRYPTOPP_LIBRARY}) +target_link_libraries(ed25519 nano_ed25519) + +add_library(crypto_lib random_pool.hpp random_pool.cpp random_pool_shuffle.hpp + secure_memory.hpp secure_memory.cpp) + +target_link_libraries(crypto_lib blake2 ed25519 ${CRYPTOPP_LIBRARY}) diff --git a/nano/lib/CMakeLists.txt b/nano/lib/CMakeLists.txt index 6c6a22599c..7abb6e6558 100644 --- a/nano/lib/CMakeLists.txt +++ b/nano/lib/CMakeLists.txt @@ -104,7 +104,6 @@ target_link_libraries( nano_lib ipc_flatbuffers_lib crypto_lib - ed25519 blake2 ${CRYPTOPP_LIBRARY} ${CMAKE_DL_LIBS}