monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 08:17:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmake: transitive deps and remove deprecated LINK_*

Browse source 
Keep the immediate direct deps at the library that depends on them,
declare deps as PUBLIC so that targets that link against that library
get the library's deps as transitive deps.

Break dep cycle between blockchain_db <-> crytonote_core.
No code refactoring, just hide cycle from cmake so that
it doesn't complain (cycles are allowed only between
static libs, not shared libs).

This is in preparation for supproting BUILD_SHARED_LIBS cmake
built-in option for building internal libs as shared.
This commit is contained in:
redfish 2016-09-17 13:59:29 -04:00
parent 54010b97b4
commit e1c7af35d4
29 changed files with 101 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
external/db_drivers/liblmdb/CMakeLists.txt vendored
View file

@ -39,7 +39,7 @@ include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
add_library(lmdb add_library(lmdb
${lmdb_sources}) ${lmdb_sources})
target_link_libraries(lmdb target_link_libraries(lmdb
LINK_PRIVATE PRIVATE
${CMAKE_THREAD_LIBS_INIT}) ${CMAKE_THREAD_LIBS_INIT})
if(WIN32) if(WIN32)
target_link_libraries(lmdb target_link_libraries(lmdb

4
external/unbound/CMakeLists.txt vendored
View file

@ -202,13 +202,13 @@ add_library(unbound
${compat_src} ${compat_src}
${libunbound_src}) ${libunbound_src})
target_link_libraries(unbound target_link_libraries(unbound
LINK_PRIVATE PRIVATE
${OPENSSL_LIBRARIES} ${OPENSSL_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}) ${CMAKE_THREAD_LIBS_INIT})
if (WIN32) if (WIN32)
target_link_libraries(unbound target_link_libraries(unbound
LINK_PRIVATE PRIVATE
iphlpapi iphlpapi
ws2_32) ws2_32)
endif () endif ()

2
src/CMakeLists.txt
View file

@ -66,7 +66,7 @@ function (bitmonero_add_executable name)
add_executable("${name}" add_executable("${name}"
${ARGN}) ${ARGN})
target_link_libraries("${name}" target_link_libraries("${name}"
LINK_PRIVATE PRIVATE
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
set_property(TARGET "${name}" set_property(TARGET "${name}"
PROPERTY PROPERTY

10
src/blockchain_db/CMakeLists.txt
View file

@ -60,18 +60,12 @@ bitmonero_add_library(blockchain_db
${blockchain_db_headers} ${blockchain_db_headers}
${blockchain_db_private_headers}) ${blockchain_db_private_headers})
target_link_libraries(blockchain_db target_link_libraries(blockchain_db
LINK_PUBLIC PUBLIC
common common
crypto crypto
cryptonote_core
${Boost_DATE_TIME_LIBRARY}
${Boost_CHRONO_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_SERIALIZATION_LIBRARY}
${LMDB_LIBRARY} ${LMDB_LIBRARY}
${BDB_LIBRARY} ${BDB_LIBRARY}
LINK_PRIVATE
${Boost_FILESYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY} ${Boost_THREAD_LIBRARY}
PRIVATE
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})

18
src/blockchain_utilities/CMakeLists.txt
View file

@ -63,11 +63,15 @@ bitmonero_add_executable(blockchain_import
${blockchain_import_private_headers}) ${blockchain_import_private_headers})
target_link_libraries(blockchain_import target_link_libraries(blockchain_import
LINK_PRIVATE PRIVATE
cryptonote_core cryptonote_core
blockchain_db blockchain_db
p2p p2p
${CMAKE_THREAD_LIBS_INIT}) ${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}
${EXTRA_LIBRARIES})
if(ARCH_WIDTH) if(ARCH_WIDTH)
target_compile_definitions(blockchain_import target_compile_definitions(blockchain_import
@ -85,11 +89,15 @@ bitmonero_add_executable(blockchain_export
${blockchain_export_private_headers}) ${blockchain_export_private_headers})
target_link_libraries(blockchain_export target_link_libraries(blockchain_export
LINK_PRIVATE PRIVATE
cryptonote_core cryptonote_core
p2p
blockchain_db blockchain_db
${CMAKE_THREAD_LIBS_INIT}) p2p
${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}
${EXTRA_LIBRARIES})
add_dependencies(blockchain_export add_dependencies(blockchain_export
version) version)

4
src/common/CMakeLists.txt
View file

@ -62,13 +62,15 @@ bitmonero_add_library(common
${common_headers} ${common_headers}
${common_private_headers}) ${common_private_headers})
target_link_libraries(common target_link_libraries(common
LINK_PRIVATE PUBLIC
crypto crypto
${UNBOUND_LIBRARY} ${UNBOUND_LIBRARY}
${LIBUNWIND_LIBRARIES} ${LIBUNWIND_LIBRARIES}
${Boost_DATE_TIME_LIBRARY} ${Boost_DATE_TIME_LIBRARY}
${Boost_FILESYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY}
PRIVATE
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
#bitmonero_install_headers(common #bitmonero_install_headers(common

5
src/crypto/CMakeLists.txt
View file

@ -74,6 +74,11 @@ bitmonero_add_library(crypto
${crypto_sources} ${crypto_sources}
${crypto_headers} ${crypto_headers}
${crypto_private_headers}) ${crypto_private_headers})
target_link_libraries(crypto
PUBLIC
${Boost_SYSTEM_LIBRARY}
PRIVATE
${EXTRA_LIBRARIES})
if (ARM) if (ARM)
option(NO_OPTIMIZED_MULTIPLY_ON_ARM option(NO_OPTIMIZED_MULTIPLY_ON_ARM

6
src/cryptonote_core/CMakeLists.txt
View file

@ -73,7 +73,7 @@ bitmonero_add_library(cryptonote_core
${cryptonote_core_headers} ${cryptonote_core_headers}
${cryptonote_core_private_headers}) ${cryptonote_core_private_headers})
target_link_libraries(cryptonote_core target_link_libraries(cryptonote_core
LINK_PUBLIC PUBLIC
common common
crypto crypto
otshell_utils otshell_utils
@ -82,9 +82,9 @@ target_link_libraries(cryptonote_core
${Boost_DATE_TIME_LIBRARY} ${Boost_DATE_TIME_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_SERIALIZATION_LIBRARY} ${Boost_SERIALIZATION_LIBRARY}
LINK_PRIVATE
${Blocks}
${Boost_FILESYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY} ${Boost_THREAD_LIBRARY}
PRIVATE
${Blocks}
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})

14
src/cryptonote_protocol/CMakeLists.txt
View file

@ -32,16 +32,10 @@ project (bitmonero CXX)
file(GLOB CRYPTONOTE_PROTOCOL *) file(GLOB CRYPTONOTE_PROTOCOL *)
source_group(cryptonote_protocol FILES ${CRYPTONOTE_PROTOCOL}) source_group(cryptonote_protocol FILES ${CRYPTONOTE_PROTOCOL})
#add_library(p2p ${P2P}) #bitmonero_private_headers(cryptonote_protocol ${CRYPTONOTE_PROTOCOL})
#bitmonero_private_headers(p2p ${CRYPTONOTE_PROTOCOL})
bitmonero_add_library(cryptonote_protocol ${CRYPTONOTE_PROTOCOL}) bitmonero_add_library(cryptonote_protocol ${CRYPTONOTE_PROTOCOL})
#target_link_libraries(p2p) target_link_libraries(cryptonote_protocol
# LINK_PRIVATE PRIVATE
# ${Boost_CHRONO_LIBRARY} ${EXTRA_LIBRARIES})
# ${Boost_REGEX_LIBRARY}
# ${Boost_SYSTEM_LIBRARY}
# ${Boost_THREAD_LIBRARY}
# ${EXTRA_LIBRARIES})
add_dependencies(cryptonote_protocol add_dependencies(cryptonote_protocol
version) version)

4
src/daemon/CMakeLists.txt
View file

@ -83,7 +83,7 @@ bitmonero_add_executable(daemon
${blocksdat} ${blocksdat}
) )
target_link_libraries(daemon target_link_libraries(daemon
LINK_PRIVATE PRIVATE
rpc rpc
blockchain_db blockchain_db
cryptonote_core cryptonote_core
@ -98,9 +98,7 @@ target_link_libraries(daemon
${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_REGEX_LIBRARY} ${Boost_REGEX_LIBRARY}
${Boost_SYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY}
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
${UPNP_LIBRARIES}
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
add_dependencies(daemon version) add_dependencies(daemon version)
set_property(TARGET daemon set_property(TARGET daemon

8
src/daemonizer/CMakeLists.txt
View file

@ -61,14 +61,10 @@ bitmonero_add_library(daemonizer
${daemonizer_headers} ${daemonizer_headers}
${daemonizer_private_headers}) ${daemonizer_private_headers})
target_link_libraries(daemonizer target_link_libraries(daemonizer
LINK_PRIVATE PUBLIC
common common
${Boost_CHRONO_LIBRARY} ${Boost_CHRONO_LIBRARY}
${Boost_FILESYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_REGEX_LIBRARY} PRIVATE
${Boost_SYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}
${UPNP_LIBRARIES}
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})

4
src/mnemonics/CMakeLists.txt
View file

@ -51,5 +51,5 @@ bitmonero_add_library(mnemonics
${mnemonics_headers} ${mnemonics_headers}
${mnemonics_private_headers}) ${mnemonics_private_headers})
target_link_libraries(mnemonics target_link_libraries(mnemonics
LINK_PRIVATE PRIVATE
${Boost_SYSTEM_LIBRARY}) ${EXTRA_LIBRARIES})

17
src/p2p/CMakeLists.txt
View file

@ -36,12 +36,15 @@ source_group(p2p FILES ${P2P})
#bitmonero_private_headers(p2p ${P2P}) #bitmonero_private_headers(p2p ${P2P})
bitmonero_add_library(p2p ${P2P}) bitmonero_add_library(p2p ${P2P})
#target_link_libraries(p2p) target_link_libraries(p2p
# LINK_PRIVATE PUBLIC
# ${Boost_CHRONO_LIBRARY} ${UPNP_LIBRARIES}
# ${Boost_REGEX_LIBRARY} ${Boost_CHRONO_LIBRARY}
# ${Boost_SYSTEM_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}
# ${Boost_THREAD_LIBRARY} ${Boost_FILESYSTEM_LIBRARY}
# ${EXTRA_LIBRARIES}) ${Boost_SYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY}
PRIVATE
${EXTRA_LIBRARIES})
add_dependencies(p2p add_dependencies(p2p
version) version)

10
src/ringct/CMakeLists.txt
View file

@ -46,14 +46,8 @@ bitmonero_add_library(ringct
${ringct_headers} ${ringct_headers}
${ringct_private_headers}) ${ringct_private_headers})
target_link_libraries(ringct target_link_libraries(ringct
LINK_PUBLIC PUBLIC
common common
crypto crypto
${Boost_DATE_TIME_LIBRARY} PRIVATE
${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_SERIALIZATION_LIBRARY}
LINK_PRIVATE
${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY}
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})

6
src/rpc/CMakeLists.txt
View file

@ -43,13 +43,11 @@ bitmonero_add_library(rpc
${rpc_headers} ${rpc_headers}
${rpc_private_headers}) ${rpc_private_headers})
target_link_libraries(rpc target_link_libraries(rpc
LINK_PRIVATE PUBLIC
cryptonote_core cryptonote_core
cryptonote_protocol cryptonote_protocol
${Boost_CHRONO_LIBRARY}
${Boost_REGEX_LIBRARY}
${Boost_SYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY} ${Boost_THREAD_LIBRARY}
PRIVATE
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
add_dependencies(rpc add_dependencies(rpc
version) version)

8
src/simplewallet/CMakeLists.txt
View file

@ -43,7 +43,7 @@ bitmonero_add_executable(simplewallet
${simplewallet_headers} ${simplewallet_headers}
${simplewallet_private_headers}) ${simplewallet_private_headers})
target_link_libraries(simplewallet target_link_libraries(simplewallet
LINK_PRIVATE PRIVATE
wallet wallet
rpc rpc
cryptonote_core cryptonote_core
@ -51,8 +51,10 @@ target_link_libraries(simplewallet
common common
mnemonics mnemonics
p2p p2p
${UNBOUND_LIBRARY} ${Boost_CHRONO_LIBRARY}
${UPNP_LIBRARIES} ${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY}
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
add_dependencies(simplewallet add_dependencies(simplewallet

8
src/wallet/CMakeLists.txt
View file

@ -64,17 +64,19 @@ bitmonero_add_library(wallet
${wallet_api_headers} ${wallet_api_headers}
${wallet_private_headers}) ${wallet_private_headers})
target_link_libraries(wallet target_link_libraries(wallet
LINK_PUBLIC PUBLIC
cryptonote_core cryptonote_core
mnemonics mnemonics
LINK_PRIVATE p2p
${Boost_CHRONO_LIBRARY}
${Boost_SERIALIZATION_LIBRARY} ${Boost_SERIALIZATION_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY} ${Boost_THREAD_LIBRARY}
${Boost_REGEX_LIBRARY} ${Boost_REGEX_LIBRARY}
PRIVATE
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
# build and install libwallet_merged only if we building for GUI # build and install libwallet_merged only if we building for GUI
if (BUILD_GUI_DEPS) if (BUILD_GUI_DEPS)
set(libs_to_merge wallet cryptonote_core mnemonics common crypto ringct) set(libs_to_merge wallet cryptonote_core mnemonics common crypto ringct)

2
tests/CMakeLists.txt
View file

@ -84,7 +84,7 @@ add_executable(hash-target-tests
${hash_targets_sources} ${hash_targets_sources}
${hash_targets_headers}) ${hash_targets_headers})
target_link_libraries(hash-target-tests target_link_libraries(hash-target-tests
LINK_PRIVATE PRIVATE
cryptonote_core) cryptonote_core)
set_property(TARGET hash-target-tests set_property(TARGET hash-target-tests
PROPERTY PROPERTY

9
tests/core_proxy/CMakeLists.txt
View file

@ -36,17 +36,12 @@ add_executable(core_proxy
${core_proxy_sources} ${core_proxy_sources}
${core_proxy_headers}) ${core_proxy_headers})
target_link_libraries(core_proxy target_link_libraries(core_proxy
LINK_PRIVATE PRIVATE
cryptonote_core cryptonote_core
cryptonote_protocol cryptonote_protocol
p2p p2p
${UPNP_LIBRARIES}
${Boost_CHRONO_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY}
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
${EXPAT_LIBRARIES}) ${EXTRA_LIBRARIES})
set_property(TARGET core_proxy set_property(TARGET core_proxy
PROPERTY PROPERTY
FOLDER "tests") FOLDER "tests")

6
tests/core_tests/CMakeLists.txt
View file

@ -62,14 +62,10 @@ add_executable(coretests
${core_tests_sources} ${core_tests_sources}
${core_tests_headers}) ${core_tests_headers})
target_link_libraries(coretests target_link_libraries(coretests
LINK_PRIVATE PRIVATE
cryptonote_core cryptonote_core
p2p p2p
${Boost_CHRONO_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY}
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
${EXPAT_LIBRARIES}
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
set_property(TARGET coretests set_property(TARGET coretests
PROPERTY PROPERTY

4
tests/crypto/CMakeLists.txt
View file

@ -41,7 +41,9 @@ add_executable(crypto-tests
${crypto_sources} ${crypto_sources}
${crypto_headers}) ${crypto_headers})
target_link_libraries(crypto-tests target_link_libraries(crypto-tests
${Boost_SYSTEM_LIBRARY}) PRIVATE
${Boost_SYSTEM_LIBRARY}
${EXTRA_LIBRARIES})
set_property(TARGET crypto-tests set_property(TARGET crypto-tests
PROPERTY PROPERTY
FOLDER "tests") FOLDER "tests")

5
tests/daemon_tests/CMakeLists.txt
View file

@ -35,15 +35,14 @@ add_executable(transfers
${transfers_sources} ${transfers_sources}
${transfers_headers}) ${transfers_headers})
target_link_libraries(transfers target_link_libraries(transfers
LINK_PRIVATE PRIVATE
useragent useragent
rpc rpc
cryptonote_core cryptonote_core
crypto crypto
common common
epee epee
${GTEST_LIBRARIES} ${GTEST_LIBRARIES})
${Boost_LIBRARIES})
file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/test_transfers") file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/test_transfers")
add_custom_target(test_transfers add_custom_target(test_transfers

5
tests/difficulty/CMakeLists.txt
View file

@ -35,8 +35,9 @@ add_executable(difficulty-tests
${difficulty_sources} ${difficulty_sources}
${difficulty_headers}) ${difficulty_headers})
target_link_libraries(difficulty-tests target_link_libraries(difficulty-tests
LINK_PRIVATE PRIVATE
cryptonote_core) cryptonote_core
${EXTRA_LIBRARIES})
set_property(TARGET difficulty-tests set_property(TARGET difficulty-tests
PROPERTY PROPERTY
FOLDER "tests") FOLDER "tests")

4
tests/functional_tests/CMakeLists.txt
View file

@ -39,13 +39,13 @@ add_executable(functional_tests
${functional_tests_sources} ${functional_tests_sources}
${functional_tests_headers}) ${functional_tests_headers})
target_link_libraries(functional_tests target_link_libraries(functional_tests
LINK_PRIVATE PRIVATE
cryptonote_core cryptonote_core
wallet wallet
common common
crypto crypto
${UNBOUND_LIBRARY}
${Boost_REGEX_LIBRARY} ${Boost_REGEX_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY}
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
set_property(TARGET functional_tests set_property(TARGET functional_tests

5
tests/hash/CMakeLists.txt
View file

@ -35,8 +35,9 @@ add_executable(hash-tests
${hash_sources} ${hash_sources}
${hash_headers}) ${hash_headers})
target_link_libraries(hash-tests target_link_libraries(hash-tests
LINK_PRIVATE PRIVATE
crypto) crypto
${EXTRA_LIBRARIES})
set_property(TARGET hash-tests set_property(TARGET hash-tests
PROPERTY PROPERTY
FOLDER "tests") FOLDER "tests")

6
tests/libwallet_api_tests/CMakeLists.txt
View file

@ -38,9 +38,13 @@ add_executable(libwallet_api_tests
${libwallet_api_tests_headers}) ${libwallet_api_tests_headers})
target_link_libraries(libwallet_api_tests target_link_libraries(libwallet_api_tests
LINK_PRIVATE PRIVATE
wallet wallet
${Boost_SERIALIZATION_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY}
${GTEST_LIBRARIES} ${GTEST_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
set_property(TARGET libwallet_api_tests set_property(TARGET libwallet_api_tests

10
tests/net_load_tests/CMakeLists.txt
View file

@ -36,16 +36,15 @@ add_executable(net_load_tests_clt
${clt_sources} ${clt_sources}
${clt_headers}) ${clt_headers})
target_link_libraries(net_load_tests_clt target_link_libraries(net_load_tests_clt
LINK_PRIVATE PRIVATE
otshell_utils otshell_utils
p2p p2p
cryptonote_core cryptonote_core
${GTEST_LIBRARIES} ${GTEST_LIBRARIES}
${Boost_CHRONO_LIBRARY} ${Boost_CHRONO_LIBRARY}
${Boost_DATE_TIME_LIBRARY} ${Boost_DATE_TIME_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
set(srv_sources set(srv_sources
@ -58,16 +57,15 @@ add_executable(net_load_tests_srv
${srv_sources} ${srv_sources}
${srv_headers}) ${srv_headers})
target_link_libraries(net_load_tests_srv target_link_libraries(net_load_tests_srv
LINK_PRIVATE PRIVATE
otshell_utils otshell_utils
p2p p2p
cryptonote_core cryptonote_core
${GTEST_LIBRARIES} ${GTEST_LIBRARIES}
${Boost_CHRONO_LIBRARY} ${Boost_CHRONO_LIBRARY}
${Boost_DATE_TIME_LIBRARY} ${Boost_DATE_TIME_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
${Boost_SYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
set_property(TARGET net_load_tests_clt net_load_tests_srv set_property(TARGET net_load_tests_clt net_load_tests_srv

3
tests/performance_tests/CMakeLists.txt
View file

@ -48,11 +48,10 @@ add_executable(performance_tests
${performance_tests_sources} ${performance_tests_sources}
${performance_tests_headers}) ${performance_tests_headers})
target_link_libraries(performance_tests target_link_libraries(performance_tests
LINK_PRIVATE PRIVATE
cryptonote_core cryptonote_core
common common
crypto crypto
${UNBOUND_LIBRARY}
${Boost_CHRONO_LIBRARY} ${Boost_CHRONO_LIBRARY}
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})

8
tests/unit_tests/CMakeLists.txt
View file

@ -62,7 +62,7 @@ add_executable(unit_tests
${unit_tests_sources} ${unit_tests_sources}
${unit_tests_headers}) ${unit_tests_headers})
target_link_libraries(unit_tests target_link_libraries(unit_tests
LINK_PRIVATE PRIVATE
ringct ringct
cryptonote_core cryptonote_core
blockchain_db blockchain_db
@ -70,11 +70,7 @@ target_link_libraries(unit_tests
wallet wallet
p2p p2p
${GTEST_LIBRARIES} ${GTEST_LIBRARIES}
${Boost_CHRONO_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}
${Boost_REGEX_LIBRARY}
${Boost_SYSTEM_LIBRARY}
${Boost_THREAD_LIBRARY}
${UNBOUND_LIBRARY}
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
set_property(TARGET unit_tests set_property(TARGET unit_tests
PROPERTY PROPERTY