From 5f51d3d04f4fab305558191ebda9e3b0bfb336d5 Mon Sep 17 00:00:00 2001 From: neodix42 Date: Mon, 23 Sep 2024 18:31:01 +0400 Subject: [PATCH] Remove redundant linking dependencies (#1198) * fixing compilation warning: ld: warning: ignoring duplicate libraries: '../crypto/libton_block.a', '../crypto/libton_crypto.a' * update upload-artifact version in TON Static Code Analysis GH action * remove even more redundant linking dependencies * remove even more redundant linking dependencies 2 --- .github/workflows/ton-ccpcheck.yml | 2 +- CMakeLists.txt | 4 ++-- adnl/CMakeLists.txt | 8 +++---- blockchain-explorer/CMakeLists.txt | 10 ++++---- catchain/CMakeLists.txt | 3 +-- create-hardfork/CMakeLists.txt | 3 +-- crypto/CMakeLists.txt | 32 ++++++++++++------------- emulator/CMakeLists.txt | 2 +- lite-client/CMakeLists.txt | 5 ++-- storage/CMakeLists.txt | 6 ++--- storage/storage-daemon/CMakeLists.txt | 5 ++-- tonlib/CMakeLists.txt | 2 +- utils/CMakeLists.txt | 12 ++++------ validator-engine-console/CMakeLists.txt | 2 +- validator-session/CMakeLists.txt | 3 +-- validator/CMakeLists.txt | 12 ++++------ 16 files changed, 47 insertions(+), 64 deletions(-) diff --git a/.github/workflows/ton-ccpcheck.yml b/.github/workflows/ton-ccpcheck.yml index d2d8cf700..95bef5f3d 100644 --- a/.github/workflows/ton-ccpcheck.yml +++ b/.github/workflows/ton-ccpcheck.yml @@ -20,7 +20,7 @@ jobs: generate report: true - name: Upload report - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@master with: name: ton-ccpcheck-report path: output diff --git a/CMakeLists.txt b/CMakeLists.txt index 70cb8b8d8..665fc2e9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -484,10 +484,10 @@ target_link_libraries(test-net PRIVATE tdnet tdutils ${CMAKE_THREAD_LIBS_INIT}) #BEGIN tonlib add_executable(test-tonlib ${TONLIB_ONLINE_TEST_SOURCE}) -target_link_libraries(test-tonlib tdutils tdactor adnllite tl_api ton_crypto ton_block tl_tonlib_api tonlib) +target_link_libraries(test-tonlib tdactor adnllite tl_api ton_crypto tl_tonlib_api tonlib) add_executable(test-tonlib-offline test/test-td-main.cpp ${TONLIB_OFFLINE_TEST_SOURCE}) -target_link_libraries(test-tonlib-offline tdutils tdactor adnllite tl_api ton_crypto ton_block fift-lib tl_tonlib_api tonlib) +target_link_libraries(test-tonlib-offline tdactor adnllite tl_api ton_crypto fift-lib tl_tonlib_api tonlib) if (NOT CMAKE_CROSSCOMPILING) add_dependencies(test-tonlib-offline gen_fif) diff --git a/adnl/CMakeLists.txt b/adnl/CMakeLists.txt index 217a96247..111c4c500 100644 --- a/adnl/CMakeLists.txt +++ b/adnl/CMakeLists.txt @@ -88,17 +88,15 @@ target_link_libraries(adnl PUBLIC tdactor ton_crypto tl_api tdnet tddb keys keyr add_executable(adnl-proxy ${ADNL_PROXY_SOURCE}) target_include_directories(adnl-proxy PUBLIC $) -target_link_libraries(adnl-proxy PUBLIC tdactor ton_crypto tl_api tdnet common - tl-utils git) +target_link_libraries(adnl-proxy PUBLIC tdactor ton_crypto tl_api tdnet common tl-utils git) add_executable(adnl-pong adnl-pong.cpp) target_include_directories(adnl-pong PUBLIC $) -target_link_libraries(adnl-pong PUBLIC tdactor ton_crypto tl_api tdnet common - tl-utils adnl dht git) +target_link_libraries(adnl-pong PUBLIC tdactor ton_crypto tl_api tdnet common tl-utils adnl dht git) add_library(adnltest STATIC ${ADNL_TEST_SOURCE}) target_include_directories(adnltest PUBLIC $) -target_link_libraries(adnltest PUBLIC adnl ) +target_link_libraries(adnltest PUBLIC adnl) install(TARGETS adnl-proxy RUNTIME DESTINATION bin) endif() diff --git a/blockchain-explorer/CMakeLists.txt b/blockchain-explorer/CMakeLists.txt index 8aae88058..36d4e5069 100644 --- a/blockchain-explorer/CMakeLists.txt +++ b/blockchain-explorer/CMakeLists.txt @@ -16,26 +16,26 @@ add_executable(blockchain-explorer ${BLOCHAIN_EXPLORER_SOURCE}) if (NIX) if (MHD_FOUND) target_include_directories(blockchain-explorer PUBLIC ${MHD_INCLUDE_DIR}) - target_link_libraries(blockchain-explorer tdutils tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ton_block ${MHD_LIBRARY}) + target_link_libraries(blockchain-explorer tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ${MHD_LIBRARY}) else() find_package(PkgConfig REQUIRED) pkg_check_modules(MHD libmicrohttpd) target_include_directories(blockchain-explorer PUBLIC ${MHD_INCLUDE_DIR} ${MHD_STATIC_INCLUDE_DIRS}) - target_link_libraries(blockchain-explorer tdutils tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ton_block ${MHD_LIBRARIES} ${MHD_STATIC_LIBRARIES}) + target_link_libraries(blockchain-explorer tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ${MHD_LIBRARIES} ${MHD_STATIC_LIBRARIES}) endif() else() if (MHD_FOUND) target_include_directories(blockchain-explorer PUBLIC ${MHD_INCLUDE_DIR}) - target_link_libraries(blockchain-explorer tdutils tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ton_block ${MHD_LIBRARY}) + target_link_libraries(blockchain-explorer tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ${MHD_LIBRARY}) else() find_package(MHD) target_include_directories(blockchain-explorer PUBLIC ${MHD_INCLUDE_DIR}) - target_link_libraries(blockchain-explorer tdutils tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ton_block ${MHD_LIBRARY}) + target_link_libraries(blockchain-explorer tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ${MHD_LIBRARY}) endif() endif() target_include_directories(blockchain-explorer PUBLIC ${MHD_INCLUDE_DIR}) -target_link_libraries(blockchain-explorer tdutils tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ton_block ${MHD_LIBRARY}) +target_link_libraries(blockchain-explorer tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ${MHD_LIBRARY}) install(TARGETS blockchain-explorer RUNTIME DESTINATION bin) diff --git a/catchain/CMakeLists.txt b/catchain/CMakeLists.txt index 8ab9525da..3f766688e 100644 --- a/catchain/CMakeLists.txt +++ b/catchain/CMakeLists.txt @@ -34,6 +34,5 @@ target_include_directories(overlay PUBLIC $/.. ${OPENSSL_INCLUDE_DIR} ) -target_link_libraries(catchain PRIVATE tdutils tdactor adnl tl_api dht tdfec - overlay) +target_link_libraries(catchain PRIVATE tdutils tdactor adnl tl_api dht tdfec overlay) diff --git a/create-hardfork/CMakeLists.txt b/create-hardfork/CMakeLists.txt index 41b94b523..3024603c2 100644 --- a/create-hardfork/CMakeLists.txt +++ b/create-hardfork/CMakeLists.txt @@ -10,8 +10,7 @@ set(CREATE_HARDFORK_SOURCE ) add_executable(create-hardfork ${CREATE_HARDFORK_SOURCE}) -target_link_libraries(create-hardfork overlay tdutils tdactor adnl tl_api dht - rldp catchain validatorsession full-node validator-hardfork ton_validator +target_link_libraries(create-hardfork overlay tdutils tdactor adnl tl_api dht rldp catchain validatorsession full-node validator-hardfork ton_validator validator-hardfork fift-lib memprof git ${JEMALLOC_LIBRARIES}) install(TARGETS create-hardfork RUNTIME DESTINATION bin) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index e525f639d..b3291602a 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -300,9 +300,8 @@ endif() target_include_directories(ton_crypto_core SYSTEM PUBLIC $) add_library(ton_crypto STATIC ${TON_CRYPTO_SOURCE}) -target_include_directories(ton_crypto PUBLIC $ - $) -target_link_libraries(ton_crypto PUBLIC ${OPENSSL_CRYPTO_LIBRARY} tdutils tddb_utils ton_crypto_core ton_block) +target_include_directories(ton_crypto PUBLIC $ $) +target_link_libraries(ton_crypto PUBLIC ${OPENSSL_CRYPTO_LIBRARY} ton_crypto_core ton_block) if (USE_EMSCRIPTEN) target_link_options(ton_crypto PRIVATE -fexceptions) target_compile_options(ton_crypto PRIVATE -fexceptions) @@ -344,6 +343,7 @@ else() target_link_libraries(ton_crypto PUBLIC ${SECP256K1_LIBRARY}) endif() +target_link_libraries(ton_crypto_core PUBLIC ${SECP256K1_LIBRARY}) target_include_directories(ton_crypto_core PUBLIC $) target_link_libraries(ton_crypto PUBLIC ${SODIUM_LIBRARY_RELEASE}) @@ -358,7 +358,7 @@ target_link_libraries(test-ed25519-crypto PUBLIC ton_crypto) add_library(fift-lib STATIC ${FIFT_SOURCE}) target_include_directories(fift-lib PUBLIC $) -target_link_libraries(fift-lib PUBLIC ton_crypto tdutils ton_block) +target_link_libraries(fift-lib PUBLIC ton_crypto) if (USE_EMSCRIPTEN) target_link_options(fift-lib PRIVATE -fexceptions) @@ -379,7 +379,7 @@ target_link_libraries(src_parser PUBLIC ton_crypto_core) add_library(ton_block STATIC ${BLOCK_SOURCE}) target_include_directories(ton_block PUBLIC $ $ $) -target_link_libraries(ton_block PUBLIC ton_crypto tdutils tdactor tl_api) +target_link_libraries(ton_block PUBLIC ton_crypto_core tdactor tl_api) if (USE_EMSCRIPTEN) target_link_options(ton_block PRIVATE -fexceptions) target_compile_options(ton_block PRIVATE -fexceptions) @@ -387,7 +387,7 @@ endif() add_executable(func func/func-main.cpp ${FUNC_LIB_SOURCE}) target_include_directories(func PUBLIC $) -target_link_libraries(func PUBLIC ton_crypto src_parser git ton_block) +target_link_libraries(func PUBLIC ton_crypto src_parser git) if (WINGETOPT_FOUND) target_link_libraries_system(func wingetopt) endif() @@ -416,17 +416,17 @@ endif() add_executable(tlbc tl/tlbc.cpp) target_include_directories(tlbc PUBLIC $) -target_link_libraries(tlbc PUBLIC ton_crypto_core src_parser) +target_link_libraries(tlbc PUBLIC src_parser) if (WINGETOPT_FOUND) target_link_libraries_system(tlbc wingetopt) endif() add_library(pow-miner-lib util/Miner.cpp util/Miner.h) target_include_directories(pow-miner-lib PUBLIC $) -target_link_libraries(pow-miner-lib PUBLIC ton_crypto ton_block) +target_link_libraries(pow-miner-lib PUBLIC ton_crypto) add_executable(pow-miner util/pow-miner.cpp) -target_link_libraries(pow-miner PRIVATE ton_crypto ton_block pow-miner-lib git) +target_link_libraries(pow-miner PRIVATE ton_crypto pow-miner-lib git) if (WINGETOPT_FOUND) target_link_libraries_system(fift wingetopt) @@ -434,7 +434,7 @@ if (WINGETOPT_FOUND) endif() add_executable(mintless-proof-generator util/mintless-proof-generator.cpp) -target_link_libraries(mintless-proof-generator PRIVATE ton_crypto ton_block git ${JEMALLOC_LIBRARIES}) +target_link_libraries(mintless-proof-generator PRIVATE ton_crypto git ${JEMALLOC_LIBRARIES}) if (JEMALLOC_FOUND) target_include_directories(mintless-proof-generator PRIVATE ${JEMALLOC_INCLUDE_DIR}) @@ -539,12 +539,12 @@ add_executable(create-state block/create-state.cpp) target_include_directories(create-state PUBLIC $ $) if (INTERNAL_COMPILE) - target_link_libraries(create-state PUBLIC ton_crypto fift-lib ton_block tonlib git) + target_link_libraries(create-state PUBLIC ton_crypto fift-lib tonlib git) else() if (TONLIB_COMPILE) - target_link_libraries(create-state PUBLIC ton_crypto fift-lib ton_block tonlib git) + target_link_libraries(create-state PUBLIC ton_crypto fift-lib tonlib git) else() - target_link_libraries(create-state PUBLIC ton_crypto fift-lib ton_block git) + target_link_libraries(create-state PUBLIC ton_crypto fift-lib git) endif() endif() if (WINGETOPT_FOUND) @@ -554,7 +554,7 @@ endif() add_executable(dump-block block/dump-block.cpp) target_include_directories(dump-block PUBLIC $ $) -target_link_libraries(dump-block PUBLIC ton_crypto fift-lib ton_block git) +target_link_libraries(dump-block PUBLIC ton_crypto fift-lib git) if (WINGETOPT_FOUND) target_link_libraries_system(dump-block wingetopt) endif() @@ -562,7 +562,7 @@ endif() add_executable(adjust-block block/adjust-block.cpp) target_include_directories(adjust-block PUBLIC $ $) -target_link_libraries(adjust-block PUBLIC ton_crypto fift-lib ton_block git) +target_link_libraries(adjust-block PUBLIC ton_crypto fift-lib git) if (WINGETOPT_FOUND) target_link_libraries_system(dump-block wingetopt) target_link_libraries_system(adjust-block wingetopt) @@ -571,7 +571,7 @@ endif() add_executable(test-weight-distr block/test-weight-distr.cpp) target_include_directories(test-weight-distr PUBLIC $ $) -target_link_libraries(test-weight-distr PUBLIC ton_crypto fift-lib ton_block git) +target_link_libraries(test-weight-distr PUBLIC ton_crypto fift-lib git) if (WINGETOPT_FOUND) target_link_libraries_system(test-weight-distr wingetopt) endif() diff --git a/emulator/CMakeLists.txt b/emulator/CMakeLists.txt index dc8cbf62b..5d59bcdbf 100644 --- a/emulator/CMakeLists.txt +++ b/emulator/CMakeLists.txt @@ -27,7 +27,7 @@ set(EMULATOR_EMSCRIPTEN_SOURCE include(GenerateExportHeader) add_library(emulator_static STATIC ${EMULATOR_STATIC_SOURCE}) -target_link_libraries(emulator_static PUBLIC ton_crypto ton_block smc-envelope) +target_link_libraries(emulator_static PUBLIC ton_crypto smc-envelope) if (NOT USE_EMSCRIPTEN AND BUILD_SHARED_LIBS) add_library(emulator SHARED ${EMULATOR_SOURCE} ${EMULATOR_HEADERS}) diff --git a/lite-client/CMakeLists.txt b/lite-client/CMakeLists.txt index 598a8d28c..c6988cf56 100644 --- a/lite-client/CMakeLists.txt +++ b/lite-client/CMakeLists.txt @@ -1,10 +1,9 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) add_library(lite-client-common STATIC lite-client-common.cpp lite-client-common.h) -target_link_libraries(lite-client-common PUBLIC tdutils tdactor adnllite tl_api tl_lite_api tl-lite-utils ton_crypto ton_block) +target_link_libraries(lite-client-common PUBLIC tdactor adnllite tl_api tl_lite_api tl-lite-utils ton_crypto) add_executable(lite-client lite-client.cpp lite-client.h) -target_link_libraries(lite-client tdutils tdactor adnllite tl_api tl_lite_api tl-lite-utils ton_crypto ton_block - terminal lite-client-common git) +target_link_libraries(lite-client tdutils tdactor adnllite tl_api tl_lite_api tl-lite-utils terminal lite-client-common git) install(TARGETS lite-client RUNTIME DESTINATION bin) diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt index 0208a33d7..30403f5e2 100644 --- a/storage/CMakeLists.txt +++ b/storage/CMakeLists.txt @@ -41,13 +41,11 @@ set(STORAGE_CLI_SOURCE add_library(storage STATIC ${STORAGE_SOURCE}) target_link_libraries(storage tdutils tdactor tddb ton_crypto tl_api ${JEMALLOC_LIBRARIES}) -target_include_directories(storage PUBLIC - $ +target_include_directories(storage PUBLIC $ ) add_executable(storage-cli ${STORAGE_CLI_SOURCE}) -target_link_libraries(storage-cli storage overlay tdutils tdactor adnl tl_api dht - rldp rldp2 fift-lib memprof terminal git ${JEMALLOC_LIBRARIES}) +target_link_libraries(storage-cli storage overlay tdutils tdactor adnl tl_api dht rldp rldp2 fift-lib memprof terminal git ${JEMALLOC_LIBRARIES}) set(STORAGE_TEST_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/test/storage.cpp diff --git a/storage/storage-daemon/CMakeLists.txt b/storage/storage-daemon/CMakeLists.txt index c987858f6..cabc61439 100644 --- a/storage/storage-daemon/CMakeLists.txt +++ b/storage/storage-daemon/CMakeLists.txt @@ -25,8 +25,7 @@ set(STORAGE_DAEMON_CLI_SOURCE ) add_executable(storage-daemon ${STORAGE_DAEMON_SOURCE}) -target_link_libraries(storage-daemon storage overlay tdutils tdactor adnl tl_api dht - rldp rldp2 fift-lib memprof git tonlib) +target_link_libraries(storage-daemon storage overlay tdutils tdactor adnl tl_api dht rldp rldp2 fift-lib memprof git tonlib) add_executable(storage-daemon-cli ${STORAGE_DAEMON_CLI_SOURCE}) -target_link_libraries(storage-daemon-cli tdutils tdactor adnllite tl_api tl_lite_api tl-lite-utils ton_block terminal git) \ No newline at end of file +target_link_libraries(storage-daemon-cli tdutils tdactor adnllite tl_api tl_lite_api tl-lite-utils ton_block terminal git) diff --git a/tonlib/CMakeLists.txt b/tonlib/CMakeLists.txt index dc3e90300..67d18e019 100644 --- a/tonlib/CMakeLists.txt +++ b/tonlib/CMakeLists.txt @@ -62,7 +62,7 @@ target_include_directories(tonlib PUBLIC $/.. $ ) -target_link_libraries(tonlib PRIVATE tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ton_crypto_core ton_block lite-client-common smc-envelope emulator_static) +target_link_libraries(tonlib PRIVATE tdactor adnllite tl_lite_api tl-lite-utils ton_crypto lite-client-common smc-envelope emulator_static) target_link_libraries(tonlib PUBLIC tdutils tl_tonlib_api) if (TONLIB_ENABLE_JNI AND NOT ANDROID) # jni is available by default on Android diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 0149e06e1..ec6eb0137 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -7,22 +7,18 @@ endif() add_executable(generate-random-id generate-random-id.cpp ) target_link_libraries(generate-random-id tl_api ton_crypto keys adnl git) -target_include_directories(generate-random-id PUBLIC - $/..) +target_include_directories(generate-random-id PUBLIC $/..) add_executable(json2tlo json2tlo.cpp ) target_link_libraries(json2tlo tl_api ton_crypto keys git) -target_include_directories(json2tlo PUBLIC - $/..) +target_include_directories(json2tlo PUBLIC $/..) add_executable(pack-viewer pack-viewer.cpp ) target_link_libraries(pack-viewer tl_api ton_crypto keys validator tddb) -target_include_directories(pack-viewer PUBLIC - $/..) +target_include_directories(pack-viewer PUBLIC $/..) add_executable(opcode-timing opcode-timing.cpp ) target_link_libraries(opcode-timing ton_crypto) -target_include_directories(pack-viewer PUBLIC - $/..) +target_include_directories(pack-viewer PUBLIC $/..) install(TARGETS generate-random-id RUNTIME DESTINATION bin) diff --git a/validator-engine-console/CMakeLists.txt b/validator-engine-console/CMakeLists.txt index 634a5b8b4..d87d8a6f3 100644 --- a/validator-engine-console/CMakeLists.txt +++ b/validator-engine-console/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR) add_executable (validator-engine-console validator-engine-console.cpp validator-engine-console.h validator-engine-console-query.cpp validator-engine-console-query.h ) -target_link_libraries(validator-engine-console tdutils tdactor adnllite tl_api tl_lite_api tl-lite-utils ton_crypto ton_block terminal git) +target_link_libraries(validator-engine-console tdactor adnllite tl_api tl_lite_api tl-lite-utils ton_crypto terminal git) install(TARGETS validator-engine-console RUNTIME DESTINATION bin) diff --git a/validator-session/CMakeLists.txt b/validator-session/CMakeLists.txt index 41911a8b0..6b4e8f687 100644 --- a/validator-session/CMakeLists.txt +++ b/validator-session/CMakeLists.txt @@ -28,5 +28,4 @@ target_include_directories(validatorsession PUBLIC $/.. ${OPENSSL_INCLUDE_DIR} ) -target_link_libraries(validatorsession PRIVATE tdutils tdactor adnl rldp tl_api dht tdfec - overlay catchain) +target_link_libraries(validatorsession PRIVATE tdutils tdactor adnl rldp tl_api dht tdfec overlay catchain) diff --git a/validator/CMakeLists.txt b/validator/CMakeLists.txt index 20462caeb..d5ba00e39 100644 --- a/validator/CMakeLists.txt +++ b/validator/CMakeLists.txt @@ -200,14 +200,10 @@ target_include_directories(full-node PUBLIC ${OPENSSL_INCLUDE_DIR} ) -target_link_libraries(validator PRIVATE tdutils tdactor adnl rldp tl_api dht tdfec - overlay catchain validatorsession ton_crypto ton_block ton_db) +target_link_libraries(validator PRIVATE tdactor adnl rldp tl_api dht tdfec overlay catchain validatorsession ton_db) -target_link_libraries(validator-disk PRIVATE tdutils tdactor adnl rldp tl_api dht tdfec - overlay catchain validatorsession ton_crypto ton_block ton_db) +target_link_libraries(validator-disk PRIVATE tdactor adnl rldp tl_api dht tdfec overlay catchain validatorsession ton_db) -target_link_libraries(validator-hardfork PRIVATE tdutils tdactor adnl rldp tl_api dht tdfec - overlay catchain validatorsession ton_crypto ton_block ton_db) +target_link_libraries(validator-hardfork PRIVATE tdactor adnl rldp tl_api dht tdfec overlay catchain validatorsession ton_db) -target_link_libraries(full-node PRIVATE tdutils tdactor adnl rldp rldp2 tl_api dht tdfec - overlay catchain validatorsession ton_crypto ton_block ton_db) +target_link_libraries(full-node PRIVATE tdactor adnl rldp rldp2 tl_api dht tdfec overlay catchain validatorsession ton_db)