From 8cf9f80050e28a0c532f45c8e0a8170b07fe364b Mon Sep 17 00:00:00 2001 From: dsc Date: Mon, 25 Mar 2024 15:21:07 +0200 Subject: [PATCH] wat --- contrib/epee/src/CMakeLists.txt | 5 +---- external/easylogging++/CMakeLists.txt | 5 +---- external/qrcodegen/CMakeLists.txt | 5 +---- src/CMakeLists.txt | 5 +---- src/blockchain_db/CMakeLists.txt | 5 +---- src/blocks/CMakeLists.txt | 5 +---- src/checkpoints/CMakeLists.txt | 5 +---- src/common/CMakeLists.txt | 5 +---- src/crypto/CMakeLists.txt | 5 +---- src/crypto/wallet/CMakeLists.txt | 5 +---- src/cryptonote_basic/CMakeLists.txt | 5 +---- src/cryptonote_core/CMakeLists.txt | 5 +---- src/cryptonote_protocol/CMakeLists.txt | 5 +---- src/device/CMakeLists.txt | 13 +++++------ src/hardforks/CMakeLists.txt | 5 +---- src/lmdb/CMakeLists.txt | 5 +---- src/mnemonics/CMakeLists.txt | 5 +---- src/multisig/CMakeLists.txt | 5 +---- src/net/CMakeLists.txt | 5 +---- src/p2p/CMakeLists.txt | 5 +---- src/ringct/CMakeLists.txt | 10 ++------- src/rpc/CMakeLists.txt | 31 +++++++++----------------- src/serialization/CMakeLists.txt | 5 +---- src/wallet/api/CMakeLists.txt | 2 +- 24 files changed, 39 insertions(+), 117 deletions(-) diff --git a/contrib/epee/src/CMakeLists.txt b/contrib/epee/src/CMakeLists.txt index 23b6002e6..7474632c3 100644 --- a/contrib/epee/src/CMakeLists.txt +++ b/contrib/epee/src/CMakeLists.txt @@ -37,10 +37,7 @@ file(GLOB EPEE_SOURCES add_library(epee) target_sources(epee PUBLIC - FILE_SET HEADERS - BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/ - FILES - ${EPEE_HEADERS_PUBLIC} + ${EPEE_HEADERS_PUBLIC} PRIVATE ${EPEE_SOURCES} ) diff --git a/external/easylogging++/CMakeLists.txt b/external/easylogging++/CMakeLists.txt index fa108ee72..db26006cd 100644 --- a/external/easylogging++/CMakeLists.txt +++ b/external/easylogging++/CMakeLists.txt @@ -29,10 +29,7 @@ add_library(easylogging) target_sources(easylogging PUBLIC - FILE_SET HEADERS - BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/easylogging++.h + ${CMAKE_CURRENT_SOURCE_DIR}/easylogging++.h PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/easylogging++.cc ) diff --git a/external/qrcodegen/CMakeLists.txt b/external/qrcodegen/CMakeLists.txt index 98b164b14..22c059fe5 100644 --- a/external/qrcodegen/CMakeLists.txt +++ b/external/qrcodegen/CMakeLists.txt @@ -2,10 +2,7 @@ add_library(qrcodegen) target_sources(qrcodegen PUBLIC - FILE_SET HEADERS - BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/QrCode.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/QrCode.hpp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/QrCode.cpp ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3efd8128f..57e8fe72e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -32,10 +32,7 @@ include(Version) add_library(version) target_sources(version PUBLIC - FILE_SET HEADERS - BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/version.h + ${CMAKE_CURRENT_SOURCE_DIR}/version.h PRIVATE ${CMAKE_BINARY_DIR}/version.cpp ) diff --git a/src/blockchain_db/CMakeLists.txt b/src/blockchain_db/CMakeLists.txt index ccc3ce7a8..93ca563ed 100644 --- a/src/blockchain_db/CMakeLists.txt +++ b/src/blockchain_db/CMakeLists.txt @@ -35,10 +35,7 @@ list(APPEND BCDB_HEADERS lmdb/db_lmdb.h) add_library(blockchain_db) target_sources(blockchain_db PUBLIC - FILE_SET HEADERS - BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../ - FILES - ${BCDB_HEADERS} + ${BCDB_HEADERS} PRIVATE ${BCDB_SOURCES} ) diff --git a/src/blocks/CMakeLists.txt b/src/blocks/CMakeLists.txt index 5e8cdaee3..d29b987f7 100644 --- a/src/blocks/CMakeLists.txt +++ b/src/blocks/CMakeLists.txt @@ -60,10 +60,7 @@ endforeach() add_library(blocks) target_sources(blocks PUBLIC - FILE_SET HEADERS - BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/blocks.h + ${CMAKE_CURRENT_SOURCE_DIR}/blocks.h PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/blocks.cpp ${GENERATED_SOURCES} diff --git a/src/checkpoints/CMakeLists.txt b/src/checkpoints/CMakeLists.txt index 345f06fee..13d9903a3 100644 --- a/src/checkpoints/CMakeLists.txt +++ b/src/checkpoints/CMakeLists.txt @@ -29,10 +29,7 @@ add_library(checkpoints) target_sources(checkpoints PUBLIC - FILE_SET HEADERS - BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/checkpoints.h + ${CMAKE_CURRENT_SOURCE_DIR}/checkpoints.h PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/checkpoints.cpp ) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 27ae24509..d2ccff792 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -33,10 +33,7 @@ add_library(common) target_sources(common PUBLIC - FILE_SET HEADERS - BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} - FILES - ${COMMON_HEADERS} + ${COMMON_HEADERS} PRIVATE ${COMMON_SOURCES} ) diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt index a98ee2950..0e839c4a5 100644 --- a/src/crypto/CMakeLists.txt +++ b/src/crypto/CMakeLists.txt @@ -58,10 +58,7 @@ endif() add_library(cncrypto) target_sources(cncrypto PUBLIC - FILE_SET HEADERS - BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} - FILES - ${crypto_headers} + ${crypto_headers} PRIVATE ${crypto_sources} ) diff --git a/src/crypto/wallet/CMakeLists.txt b/src/crypto/wallet/CMakeLists.txt index bd746e924..0e81dd134 100644 --- a/src/crypto/wallet/CMakeLists.txt +++ b/src/crypto/wallet/CMakeLists.txt @@ -33,10 +33,7 @@ check_language(ASM-ATT) add_library(wallet-crypto crypto.h) target_sources(wallet-crypto PUBLIC - FILE_SET HEADERS - BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/crypto.h + ${CMAKE_CURRENT_SOURCE_DIR}/crypto.h ) target_include_directories(wallet-crypto diff --git a/src/cryptonote_basic/CMakeLists.txt b/src/cryptonote_basic/CMakeLists.txt index 6ab987bf7..feb13adad 100644 --- a/src/cryptonote_basic/CMakeLists.txt +++ b/src/cryptonote_basic/CMakeLists.txt @@ -46,10 +46,7 @@ target_include_directories(cryptonote_format_utils_basic add_library(cryptonote_basic) target_sources(cryptonote_basic PUBLIC - FILE_SET HEADERS - BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../ - FILES - ${CN_BASIC_HEADERS} + ${CN_BASIC_HEADERS} PRIVATE ${CN_BASIC_SOURCES} ) diff --git a/src/cryptonote_core/CMakeLists.txt b/src/cryptonote_core/CMakeLists.txt index 74ad2d0ac..61cb66c30 100644 --- a/src/cryptonote_core/CMakeLists.txt +++ b/src/cryptonote_core/CMakeLists.txt @@ -57,10 +57,7 @@ endif() target_sources(cryptonote_core PUBLIC - FILE_SET HEADERS - BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../ - FILES - ${CN_CORE_HEADERS} + ${CN_CORE_HEADERS} PRIVATE ${CN_CORE_SOURCES} ) diff --git a/src/cryptonote_protocol/CMakeLists.txt b/src/cryptonote_protocol/CMakeLists.txt index 934d289b3..994fde236 100644 --- a/src/cryptonote_protocol/CMakeLists.txt +++ b/src/cryptonote_protocol/CMakeLists.txt @@ -32,10 +32,7 @@ file(GLOB CN_PROT_SOURCES *.cpp *.c *.cc) add_library(cryptonote_protocol) target_sources(cryptonote_protocol PUBLIC - FILE_SET HEADERS - BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} - FILES - ${CN_PROT_HEADERS} + ${CN_PROT_HEADERS} PRIVATE ${CN_PROT_SOURCES} ) diff --git a/src/device/CMakeLists.txt b/src/device/CMakeLists.txt index 6840b05a8..9d70cb917 100644 --- a/src/device/CMakeLists.txt +++ b/src/device/CMakeLists.txt @@ -29,14 +29,11 @@ add_library(device) target_sources(device PUBLIC - FILE_SET HEADERS - BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../ - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/device.hpp - ${CMAKE_CURRENT_SOURCE_DIR}/device_io.hpp - ${CMAKE_CURRENT_SOURCE_DIR}/device_default.hpp - ${CMAKE_CURRENT_SOURCE_DIR}/device_cold.hpp - ${CMAKE_CURRENT_SOURCE_DIR}/log.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/device.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/device_io.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/device_default.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/device_cold.hpp + ${CMAKE_CURRENT_SOURCE_DIR}/log.hpp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/device.cpp ${CMAKE_CURRENT_SOURCE_DIR}/device_default.cpp diff --git a/src/hardforks/CMakeLists.txt b/src/hardforks/CMakeLists.txt index d6aeb064b..ac8f99cca 100644 --- a/src/hardforks/CMakeLists.txt +++ b/src/hardforks/CMakeLists.txt @@ -29,10 +29,7 @@ add_library(hardforks) target_sources(hardforks PUBLIC - FILE_SET HEADERS - BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/hardforks.h + ${CMAKE_CURRENT_SOURCE_DIR}/hardforks.h PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/hardforks.cpp ) diff --git a/src/lmdb/CMakeLists.txt b/src/lmdb/CMakeLists.txt index b3ca25d4f..12c2e1a51 100644 --- a/src/lmdb/CMakeLists.txt +++ b/src/lmdb/CMakeLists.txt @@ -32,10 +32,7 @@ file(GLOB LMDB_SOURCES *.cpp *.c *.cc) add_library(lmdb_lib ${LMDB_SOURCES}) target_sources(lmdb_lib PUBLIC - FILE_SET HEADERS - BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} - FILES - ${LMDB_HEADERS} + ${LMDB_HEADERS} PRIVATE ${LMDB_SOURCES} ) diff --git a/src/mnemonics/CMakeLists.txt b/src/mnemonics/CMakeLists.txt index 0d9b8f098..690ca64aa 100644 --- a/src/mnemonics/CMakeLists.txt +++ b/src/mnemonics/CMakeLists.txt @@ -32,10 +32,7 @@ file(GLOB MN_SOURCES *.cpp *.c *.cc) add_library(mnemonics) target_sources(mnemonics PUBLIC - FILE_SET HEADERS - BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} - FILES - ${MN_HEADERS} + ${MN_HEADERS} PRIVATE ${MN_SOURCES} ) diff --git a/src/multisig/CMakeLists.txt b/src/multisig/CMakeLists.txt index eeb2172aa..691fc433f 100644 --- a/src/multisig/CMakeLists.txt +++ b/src/multisig/CMakeLists.txt @@ -34,10 +34,7 @@ file(GLOB MULTISIG_SOURCES add_library(multisig) target_sources(multisig PUBLIC - FILE_SET HEADERS - BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} - FILES - ${MULTISIG_HEADERS} + ${MULTISIG_HEADERS} PRIVATE ${MULTISIG_SOURCES} ) diff --git a/src/net/CMakeLists.txt b/src/net/CMakeLists.txt index e446bb88c..eb044a86f 100644 --- a/src/net/CMakeLists.txt +++ b/src/net/CMakeLists.txt @@ -33,10 +33,7 @@ file(GLOB NET_SOURCES *.cpp *.c *.cc) add_library(net) target_sources(net PUBLIC - FILE_SET HEADERS - BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../ - FILES - ${NET_HEADERS} + ${NET_HEADERS} PRIVATE ${NET_SOURCES} ) diff --git a/src/p2p/CMakeLists.txt b/src/p2p/CMakeLists.txt index ef571e40d..5b4f8a5c1 100644 --- a/src/p2p/CMakeLists.txt +++ b/src/p2p/CMakeLists.txt @@ -32,10 +32,7 @@ file(GLOB P2P_SOURCES *.cpp *.c *.cc) add_library(p2p) target_sources(p2p PUBLIC - FILE_SET HEADERS - BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} - FILES - ${P2P_HEADERS} + ${P2P_HEADERS} PRIVATE ${P2P_SOURCES} ) diff --git a/src/ringct/CMakeLists.txt b/src/ringct/CMakeLists.txt index e7c19f3ff..ced225ff9 100644 --- a/src/ringct/CMakeLists.txt +++ b/src/ringct/CMakeLists.txt @@ -47,10 +47,7 @@ set(ringct_basic_headers add_library(ringct_basic) target_sources(ringct_basic PUBLIC - FILE_SET HEADERS - BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} - FILES - ${ringct_basic_headers} + ${ringct_basic_headers} PRIVATE ${ringct_basic_sources} ) @@ -72,10 +69,7 @@ target_include_directories(ringct_basic add_library(ringct) target_sources(ringct PUBLIC - FILE_SET HEADERS - BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/rctSigs.h + ${CMAKE_CURRENT_SOURCE_DIR}/rctSigs.h PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/rctSigs.cpp ) diff --git a/src/rpc/CMakeLists.txt b/src/rpc/CMakeLists.txt index 620f3b45e..4bd932dd5 100644 --- a/src/rpc/CMakeLists.txt +++ b/src/rpc/CMakeLists.txt @@ -31,12 +31,9 @@ add_library(rpc_base) target_sources(rpc_base PUBLIC - FILE_SET HEADERS - BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/rpc_args.h - ${CMAKE_CURRENT_SOURCE_DIR}/rpc_payment_signature.h - ${CMAKE_CURRENT_SOURCE_DIR}/rpc_handler.h + ${CMAKE_CURRENT_SOURCE_DIR}/rpc_args.h + ${CMAKE_CURRENT_SOURCE_DIR}/rpc_payment_signature.h + ${CMAKE_CURRENT_SOURCE_DIR}/rpc_handler.h PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/rpc_args.cpp ${CMAKE_CURRENT_SOURCE_DIR}/rpc_payment_signature.cpp @@ -65,16 +62,13 @@ monero_install_library(rpc_base "${CMAKE_INSTALL_INCLUDEDIR}/monero/rpc/") add_library(rpc) target_sources(rpc PUBLIC - FILE_SET HEADERS - BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/rpc_version_str.h - ${CMAKE_CURRENT_SOURCE_DIR}/rpc_handler.h - ${CMAKE_CURRENT_SOURCE_DIR}/bootstrap_daemon.h - ${CMAKE_CURRENT_SOURCE_DIR}/core_rpc_server.h - ${CMAKE_CURRENT_SOURCE_DIR}/rpc_payment.h - ${CMAKE_CURRENT_SOURCE_DIR}/core_rpc_server_commands_defs.h - ${CMAKE_CURRENT_SOURCE_DIR}/core_rpc_server_error_codes.h + ${CMAKE_CURRENT_SOURCE_DIR}/rpc_version_str.h + ${CMAKE_CURRENT_SOURCE_DIR}/rpc_handler.h + ${CMAKE_CURRENT_SOURCE_DIR}/bootstrap_daemon.h + ${CMAKE_CURRENT_SOURCE_DIR}/core_rpc_server.h + ${CMAKE_CURRENT_SOURCE_DIR}/rpc_payment.h + ${CMAKE_CURRENT_SOURCE_DIR}/core_rpc_server_commands_defs.h + ${CMAKE_CURRENT_SOURCE_DIR}/core_rpc_server_error_codes.h PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/bootstrap_daemon.cpp ${CMAKE_CURRENT_SOURCE_DIR}/bootstrap_node_selector.cpp @@ -110,10 +104,7 @@ monero_install_library(rpc "${CMAKE_INSTALL_INCLUDEDIR}/monero/rpc/") add_library(rpc_pub) target_sources(rpc_pub PUBLIC - FILE_SET HEADERS - BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} - FILES - ${CMAKE_CURRENT_SOURCE_DIR}/zmq_pub.h + ${CMAKE_CURRENT_SOURCE_DIR}/zmq_pub.h PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/zmq_pub.cpp ) diff --git a/src/serialization/CMakeLists.txt b/src/serialization/CMakeLists.txt index d133f593e..1da1bd328 100644 --- a/src/serialization/CMakeLists.txt +++ b/src/serialization/CMakeLists.txt @@ -32,10 +32,7 @@ file(GLOB SER_SOURCES *.cpp *.c *.cc) add_library(serialization) target_sources(serialization PUBLIC - FILE_SET HEADERS - BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../ - FILES - ${SER_HEADERS} + ${SER_HEADERS} PRIVATE ${SER_SOURCES} ) diff --git a/src/wallet/api/CMakeLists.txt b/src/wallet/api/CMakeLists.txt index 3a19cca38..3c874eaf5 100644 --- a/src/wallet/api/CMakeLists.txt +++ b/src/wallet/api/CMakeLists.txt @@ -89,6 +89,6 @@ target_sources(wallet_api ${wallet_api_private_headers} ${wallet_api_sources} PUBLIC - FILE_SET HEADERS BASE_DIRS ${PROJECT_SOURCE_DIR}/src FILES ${wallet_api_headers}) + ${wallet_api_headers}) monero_install_library(wallet_api "${CMAKE_INSTALL_INCLUDEDIR}/monero/wallet/api/")