Fix linker warnings about duplicate libs (#4299)

Fix linker warnings about duplicate libs
This commit is contained in:
Piotr Wójcik 2023-09-27 20:28:43 +02:00 committed by GitHub
commit a1cc7a5a8c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 23 additions and 60 deletions

View file

@ -63,15 +63,7 @@ target_compile_definitions(
core_test PRIVATE -DTAG_VERSION_STRING=${TAG_VERSION_STRING}
-DGIT_COMMIT_HASH=${GIT_COMMIT_HASH})
target_link_libraries(
core_test
node
secure
test_common
gtest
libminiupnpc-static
Boost::log_setup
Boost::log)
target_link_libraries(core_test test_common)
include_directories(${CMAKE_SOURCE_DIR}/submodules)
include_directories(${CMAKE_SOURCE_DIR}/submodules/cpptoml/include)

View file

@ -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})

View file

@ -1,11 +1,3 @@
add_executable(ipc_flatbuffers_test_client entry.cpp)
target_link_libraries(
ipc_flatbuffers_test_client
nano_lib
Boost::filesystem
Boost::log_setup
Boost::log
Boost::program_options
Boost::system
Boost::thread)
target_link_libraries(ipc_flatbuffers_test_client node)

View file

@ -102,13 +102,12 @@ include_directories(
target_link_libraries(
nano_lib
ed25519
ipc_flatbuffers_lib
crypto_lib
blake2
secure
ipc_flatbuffers_lib
${CRYPTOPP_LIBRARY}
${CMAKE_DL_LIBS}
Boost::iostreams
Boost::asio
Boost::circular_buffer
Boost::dll

View file

@ -1,6 +1,6 @@
add_executable(load_test entry.cpp)
target_link_libraries(load_test boost_process node secure test_common gtest)
target_link_libraries(load_test test_common Boost::process)
include_directories(${CMAKE_SOURCE_DIR}/submodules)
include_directories(${CMAKE_SOURCE_DIR}/submodules/cpptoml/include)

View file

@ -1,13 +1,7 @@
add_executable(nano_node daemon.cpp daemon.hpp entry.cpp)
target_link_libraries(
nano_node
Boost::process
node
rpc
secure
argon2
${PLATFORM_LIBS})
target_link_libraries(nano_node node Boost::process ${PLATFORM_LIBS})
include_directories(${CMAKE_SOURCE_DIR}/submodules)
target_compile_definitions(

View file

@ -1,16 +1,6 @@
add_executable(nano_rpc entry.cpp)
target_link_libraries(
nano_rpc
rpc
node
secure
Boost::filesystem
Boost::log_setup
Boost::log
Boost::program_options
Boost::system
Boost::thread)
target_link_libraries(nano_rpc node)
target_compile_definitions(
nano_rpc

View file

@ -206,10 +206,10 @@ endif()
target_link_libraries(
node
nano_store
rpc
secure
nano_lib
nano_store
secure
rpc
libminiupnpc-static
argon2
lmdb

View file

@ -15,4 +15,4 @@ add_library(
rpc_request_processor.hpp
rpc_request_processor.cpp)
target_link_libraries(rpc Boost::beast nano_lib ${OPENSSL_LIBRARIES})
target_link_libraries(rpc nano_lib Boost::beast ${OPENSSL_LIBRARIES})

View file

@ -1,6 +1,6 @@
add_executable(rpc_test common.hpp common.cpp entry.cpp receivable.cpp rpc.cpp)
target_link_libraries(rpc_test node secure rpc test_common gtest)
target_link_libraries(rpc_test test_common)
target_compile_definitions(
rpc_test

View file

@ -50,14 +50,8 @@ add_library(
utility.cpp
working.hpp)
target_link_libraries(
secure
nano_lib
ed25519
crypto_lib
Boost::iostreams
Boost::system
Boost::filesystem)
target_link_libraries(secure nano_lib ed25519 crypto_lib Boost::system
Boost::filesystem)
target_compile_definitions(secure PUBLIC -DQT_NO_KEYWORDS
-DBOOST_ASIO_HAS_STD_ARRAY=1)

View file

@ -1,7 +1,6 @@
add_executable(slow_test entry.cpp node.cpp vote_cache.cpp vote_processor.cpp
bootstrap.cpp)
target_link_libraries(slow_test secure node test_common gtest
libminiupnpc-static)
target_link_libraries(slow_test test_common)
include_directories(${CMAKE_SOURCE_DIR}/submodules)