Skip to content

Commit 5f51d3d

Browse files
neodix42neodix42
authored
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
1 parent eea95ae commit 5f51d3d

File tree

16 files changed

+47
-64
lines changed

16 files changed

+47
-64
lines changed

‎.github/workflows/ton-ccpcheck.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
generate report: true
2121

2222
- name: Upload report
23-
uses: actions/upload-artifact@v1
23+
uses: actions/upload-artifact@master
2424
with:
2525
name: ton-ccpcheck-report
2626
path: output

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -484,10 +484,10 @@ target_link_libraries(test-net PRIVATE tdnet tdutils ${CMAKE_THREAD_LIBS_INIT})
484484

485485
#BEGIN tonlib
486486
add_executable(test-tonlib ${TONLIB_ONLINE_TEST_SOURCE})
487-
target_link_libraries(test-tonlib tdutils tdactor adnllite tl_api ton_crypto ton_block tl_tonlib_api tonlib)
487+
target_link_libraries(test-tonlib tdactor adnllite tl_api ton_crypto tl_tonlib_api tonlib)
488488

489489
add_executable(test-tonlib-offline test/test-td-main.cpp ${TONLIB_OFFLINE_TEST_SOURCE})
490-
target_link_libraries(test-tonlib-offline tdutils tdactor adnllite tl_api ton_crypto ton_block fift-lib tl_tonlib_api tonlib)
490+
target_link_libraries(test-tonlib-offline tdactor adnllite tl_api ton_crypto fift-lib tl_tonlib_api tonlib)
491491

492492
if (NOT CMAKE_CROSSCOMPILING)
493493
add_dependencies(test-tonlib-offline gen_fif)

‎adnl/CMakeLists.txt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,17 +88,15 @@ target_link_libraries(adnl PUBLIC tdactor ton_crypto tl_api tdnet tddb keys keyr
8888

8989
add_executable(adnl-proxy ${ADNL_PROXY_SOURCE})
9090
target_include_directories(adnl-proxy PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>)
91-
target_link_libraries(adnl-proxy PUBLIC tdactor ton_crypto tl_api tdnet common
92-
tl-utils git)
91+
target_link_libraries(adnl-proxy PUBLIC tdactor ton_crypto tl_api tdnet common tl-utils git)
9392

9493
add_executable(adnl-pong adnl-pong.cpp)
9594
target_include_directories(adnl-pong PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>)
96-
target_link_libraries(adnl-pong PUBLIC tdactor ton_crypto tl_api tdnet common
97-
tl-utils adnl dht git)
95+
target_link_libraries(adnl-pong PUBLIC tdactor ton_crypto tl_api tdnet common tl-utils adnl dht git)
9896

9997
add_library(adnltest STATIC ${ADNL_TEST_SOURCE})
10098
target_include_directories(adnltest PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>)
101-
target_link_libraries(adnltest PUBLIC adnl )
99+
target_link_libraries(adnltest PUBLIC adnl)
102100

103101
install(TARGETS adnl-proxy RUNTIME DESTINATION bin)
104102
endif()

‎blockchain-explorer/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,26 @@ add_executable(blockchain-explorer ${BLOCHAIN_EXPLORER_SOURCE})
1616
if (NIX)
1717
if (MHD_FOUND)
1818
target_include_directories(blockchain-explorer PUBLIC ${MHD_INCLUDE_DIR})
19-
target_link_libraries(blockchain-explorer tdutils tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ton_block ${MHD_LIBRARY})
19+
target_link_libraries(blockchain-explorer tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ${MHD_LIBRARY})
2020
else()
2121
find_package(PkgConfig REQUIRED)
2222
pkg_check_modules(MHD libmicrohttpd)
2323
target_include_directories(blockchain-explorer PUBLIC ${MHD_INCLUDE_DIR} ${MHD_STATIC_INCLUDE_DIRS})
24-
target_link_libraries(blockchain-explorer tdutils tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ton_block ${MHD_LIBRARIES} ${MHD_STATIC_LIBRARIES})
24+
target_link_libraries(blockchain-explorer tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ${MHD_LIBRARIES} ${MHD_STATIC_LIBRARIES})
2525
endif()
2626
else()
2727
if (MHD_FOUND)
2828
target_include_directories(blockchain-explorer PUBLIC ${MHD_INCLUDE_DIR})
29-
target_link_libraries(blockchain-explorer tdutils tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ton_block ${MHD_LIBRARY})
29+
target_link_libraries(blockchain-explorer tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ${MHD_LIBRARY})
3030
else()
3131
find_package(MHD)
3232
target_include_directories(blockchain-explorer PUBLIC ${MHD_INCLUDE_DIR})
33-
target_link_libraries(blockchain-explorer tdutils tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ton_block ${MHD_LIBRARY})
33+
target_link_libraries(blockchain-explorer tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ${MHD_LIBRARY})
3434
endif()
3535
endif()
3636

3737
target_include_directories(blockchain-explorer PUBLIC ${MHD_INCLUDE_DIR})
38-
target_link_libraries(blockchain-explorer tdutils tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ton_block ${MHD_LIBRARY})
38+
target_link_libraries(blockchain-explorer tdactor adnllite tl_lite_api tl-lite-utils ton_crypto ${MHD_LIBRARY})
3939

4040
install(TARGETS blockchain-explorer RUNTIME DESTINATION bin)
4141

‎catchain/CMakeLists.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,5 @@ target_include_directories(overlay PUBLIC
3434
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>/..
3535
${OPENSSL_INCLUDE_DIR}
3636
)
37-
target_link_libraries(catchain PRIVATE tdutils tdactor adnl tl_api dht tdfec
38-
overlay)
37+
target_link_libraries(catchain PRIVATE tdutils tdactor adnl tl_api dht tdfec overlay)
3938

‎create-hardfork/CMakeLists.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ set(CREATE_HARDFORK_SOURCE
1010
)
1111

1212
add_executable(create-hardfork ${CREATE_HARDFORK_SOURCE})
13-
target_link_libraries(create-hardfork overlay tdutils tdactor adnl tl_api dht
14-
rldp catchain validatorsession full-node validator-hardfork ton_validator
13+
target_link_libraries(create-hardfork overlay tdutils tdactor adnl tl_api dht rldp catchain validatorsession full-node validator-hardfork ton_validator
1514
validator-hardfork fift-lib memprof git ${JEMALLOC_LIBRARIES})
1615

1716
install(TARGETS create-hardfork RUNTIME DESTINATION bin)

‎crypto/CMakeLists.txt‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -300,9 +300,8 @@ endif()
300300
target_include_directories(ton_crypto_core SYSTEM PUBLIC $<BUILD_INTERFACE:${OPENSSL_INCLUDE_DIR}>)
301301

302302
add_library(ton_crypto STATIC ${TON_CRYPTO_SOURCE})
303-
target_include_directories(ton_crypto PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
304-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>)
305-
target_link_libraries(ton_crypto PUBLIC ${OPENSSL_CRYPTO_LIBRARY} tdutils tddb_utils ton_crypto_core ton_block)
303+
target_include_directories(ton_crypto PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>)
304+
target_link_libraries(ton_crypto PUBLIC ${OPENSSL_CRYPTO_LIBRARY} ton_crypto_core ton_block)
306305
if (USE_EMSCRIPTEN)
307306
target_link_options(ton_crypto PRIVATE -fexceptions)
308307
target_compile_options(ton_crypto PRIVATE -fexceptions)
@@ -344,6 +343,7 @@ else()
344343
target_link_libraries(ton_crypto PUBLIC ${SECP256K1_LIBRARY})
345344
endif()
346345

346+
target_link_libraries(ton_crypto_core PUBLIC ${SECP256K1_LIBRARY})
347347
target_include_directories(ton_crypto_core PUBLIC $<BUILD_INTERFACE:${SODIUM_INCLUDE_DIR}>)
348348
target_link_libraries(ton_crypto PUBLIC ${SODIUM_LIBRARY_RELEASE})
349349

@@ -358,7 +358,7 @@ target_link_libraries(test-ed25519-crypto PUBLIC ton_crypto)
358358

359359
add_library(fift-lib STATIC ${FIFT_SOURCE})
360360
target_include_directories(fift-lib PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
361-
target_link_libraries(fift-lib PUBLIC ton_crypto tdutils ton_block)
361+
target_link_libraries(fift-lib PUBLIC ton_crypto)
362362

363363
if (USE_EMSCRIPTEN)
364364
target_link_options(fift-lib PRIVATE -fexceptions)
@@ -379,15 +379,15 @@ target_link_libraries(src_parser PUBLIC ton_crypto_core)
379379
add_library(ton_block STATIC ${BLOCK_SOURCE})
380380
target_include_directories(ton_block PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
381381
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/block> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>)
382-
target_link_libraries(ton_block PUBLIC ton_crypto tdutils tdactor tl_api)
382+
target_link_libraries(ton_block PUBLIC ton_crypto_core tdactor tl_api)
383383
if (USE_EMSCRIPTEN)
384384
target_link_options(ton_block PRIVATE -fexceptions)
385385
target_compile_options(ton_block PRIVATE -fexceptions)
386386
endif()
387387

388388
add_executable(func func/func-main.cpp ${FUNC_LIB_SOURCE})
389389
target_include_directories(func PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
390-
target_link_libraries(func PUBLIC ton_crypto src_parser git ton_block)
390+
target_link_libraries(func PUBLIC ton_crypto src_parser git)
391391
if (WINGETOPT_FOUND)
392392
target_link_libraries_system(func wingetopt)
393393
endif()
@@ -416,25 +416,25 @@ endif()
416416

417417
add_executable(tlbc tl/tlbc.cpp)
418418
target_include_directories(tlbc PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
419-
target_link_libraries(tlbc PUBLIC ton_crypto_core src_parser)
419+
target_link_libraries(tlbc PUBLIC src_parser)
420420
if (WINGETOPT_FOUND)
421421
target_link_libraries_system(tlbc wingetopt)
422422
endif()
423423

424424
add_library(pow-miner-lib util/Miner.cpp util/Miner.h)
425425
target_include_directories(pow-miner-lib PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
426-
target_link_libraries(pow-miner-lib PUBLIC ton_crypto ton_block)
426+
target_link_libraries(pow-miner-lib PUBLIC ton_crypto)
427427

428428
add_executable(pow-miner util/pow-miner.cpp)
429-
target_link_libraries(pow-miner PRIVATE ton_crypto ton_block pow-miner-lib git)
429+
target_link_libraries(pow-miner PRIVATE ton_crypto pow-miner-lib git)
430430

431431
if (WINGETOPT_FOUND)
432432
target_link_libraries_system(fift wingetopt)
433433
target_link_libraries_system(pow-miner wingetopt)
434434
endif()
435435

436436
add_executable(mintless-proof-generator util/mintless-proof-generator.cpp)
437-
target_link_libraries(mintless-proof-generator PRIVATE ton_crypto ton_block git ${JEMALLOC_LIBRARIES})
437+
target_link_libraries(mintless-proof-generator PRIVATE ton_crypto git ${JEMALLOC_LIBRARIES})
438438

439439
if (JEMALLOC_FOUND)
440440
target_include_directories(mintless-proof-generator PRIVATE ${JEMALLOC_INCLUDE_DIR})
@@ -539,12 +539,12 @@ add_executable(create-state block/create-state.cpp)
539539
target_include_directories(create-state PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
540540
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>)
541541
if (INTERNAL_COMPILE)
542-
target_link_libraries(create-state PUBLIC ton_crypto fift-lib ton_block tonlib git)
542+
target_link_libraries(create-state PUBLIC ton_crypto fift-lib tonlib git)
543543
else()
544544
if (TONLIB_COMPILE)
545-
target_link_libraries(create-state PUBLIC ton_crypto fift-lib ton_block tonlib git)
545+
target_link_libraries(create-state PUBLIC ton_crypto fift-lib tonlib git)
546546
else()
547-
target_link_libraries(create-state PUBLIC ton_crypto fift-lib ton_block git)
547+
target_link_libraries(create-state PUBLIC ton_crypto fift-lib git)
548548
endif()
549549
endif()
550550
if (WINGETOPT_FOUND)
@@ -554,15 +554,15 @@ endif()
554554
add_executable(dump-block block/dump-block.cpp)
555555
target_include_directories(dump-block PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
556556
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>)
557-
target_link_libraries(dump-block PUBLIC ton_crypto fift-lib ton_block git)
557+
target_link_libraries(dump-block PUBLIC ton_crypto fift-lib git)
558558
if (WINGETOPT_FOUND)
559559
target_link_libraries_system(dump-block wingetopt)
560560
endif()
561561

562562
add_executable(adjust-block block/adjust-block.cpp)
563563
target_include_directories(adjust-block PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
564564
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>)
565-
target_link_libraries(adjust-block PUBLIC ton_crypto fift-lib ton_block git)
565+
target_link_libraries(adjust-block PUBLIC ton_crypto fift-lib git)
566566
if (WINGETOPT_FOUND)
567567
target_link_libraries_system(dump-block wingetopt)
568568
target_link_libraries_system(adjust-block wingetopt)
@@ -571,7 +571,7 @@ endif()
571571
add_executable(test-weight-distr block/test-weight-distr.cpp)
572572
target_include_directories(test-weight-distr PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
573573
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>)
574-
target_link_libraries(test-weight-distr PUBLIC ton_crypto fift-lib ton_block git)
574+
target_link_libraries(test-weight-distr PUBLIC ton_crypto fift-lib git)
575575
if (WINGETOPT_FOUND)
576576
target_link_libraries_system(test-weight-distr wingetopt)
577577
endif()

‎emulator/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ set(EMULATOR_EMSCRIPTEN_SOURCE
2727
include(GenerateExportHeader)
2828

2929
add_library(emulator_static STATIC ${EMULATOR_STATIC_SOURCE})
30-
target_link_libraries(emulator_static PUBLIC ton_crypto ton_block smc-envelope)
30+
target_link_libraries(emulator_static PUBLIC ton_crypto smc-envelope)
3131

3232
if (NOT USE_EMSCRIPTEN AND BUILD_SHARED_LIBS)
3333
add_library(emulator SHARED ${EMULATOR_SOURCE} ${EMULATOR_HEADERS})

‎lite-client/CMakeLists.txt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
22

33
add_library(lite-client-common STATIC lite-client-common.cpp lite-client-common.h)
4-
target_link_libraries(lite-client-common PUBLIC tdutils tdactor adnllite tl_api tl_lite_api tl-lite-utils ton_crypto ton_block)
4+
target_link_libraries(lite-client-common PUBLIC tdactor adnllite tl_api tl_lite_api tl-lite-utils ton_crypto)
55

66
add_executable(lite-client lite-client.cpp lite-client.h)
7-
target_link_libraries(lite-client tdutils tdactor adnllite tl_api tl_lite_api tl-lite-utils ton_crypto ton_block
8-
terminal lite-client-common git)
7+
target_link_libraries(lite-client tdutils tdactor adnllite tl_api tl_lite_api tl-lite-utils terminal lite-client-common git)
98

109
install(TARGETS lite-client RUNTIME DESTINATION bin)

‎storage/CMakeLists.txt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,11 @@ set(STORAGE_CLI_SOURCE
4141

4242
add_library(storage STATIC ${STORAGE_SOURCE})
4343
target_link_libraries(storage tdutils tdactor tddb ton_crypto tl_api ${JEMALLOC_LIBRARIES})
44-
target_include_directories(storage PUBLIC
45-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
44+
target_include_directories(storage PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
4645
)
4746

4847
add_executable(storage-cli ${STORAGE_CLI_SOURCE})
49-
target_link_libraries(storage-cli storage overlay tdutils tdactor adnl tl_api dht
50-
rldp rldp2 fift-lib memprof terminal git ${JEMALLOC_LIBRARIES})
48+
target_link_libraries(storage-cli storage overlay tdutils tdactor adnl tl_api dht rldp rldp2 fift-lib memprof terminal git ${JEMALLOC_LIBRARIES})
5149

5250
set(STORAGE_TEST_SOURCE
5351
${CMAKE_CURRENT_SOURCE_DIR}/test/storage.cpp

0 commit comments

Comments
 (0)