This commit is contained in:
dsc 2024-03-25 15:21:07 +02:00
parent e3d8ab8281
commit 8cf9f80050
24 changed files with 39 additions and 117 deletions

View File

@ -37,10 +37,7 @@ file(GLOB EPEE_SOURCES
add_library(epee) add_library(epee)
target_sources(epee target_sources(epee
PUBLIC PUBLIC
FILE_SET HEADERS ${EPEE_HEADERS_PUBLIC}
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/
FILES
${EPEE_HEADERS_PUBLIC}
PRIVATE PRIVATE
${EPEE_SOURCES} ${EPEE_SOURCES}
) )

View File

@ -29,10 +29,7 @@
add_library(easylogging) add_library(easylogging)
target_sources(easylogging target_sources(easylogging
PUBLIC PUBLIC
FILE_SET HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/easylogging++.h
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
FILES
${CMAKE_CURRENT_SOURCE_DIR}/easylogging++.h
PRIVATE PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/easylogging++.cc ${CMAKE_CURRENT_SOURCE_DIR}/easylogging++.cc
) )

View File

@ -2,10 +2,7 @@ add_library(qrcodegen)
target_sources(qrcodegen target_sources(qrcodegen
PUBLIC PUBLIC
FILE_SET HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/QrCode.hpp
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
FILES
${CMAKE_CURRENT_SOURCE_DIR}/QrCode.hpp
PRIVATE PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/QrCode.cpp ${CMAKE_CURRENT_SOURCE_DIR}/QrCode.cpp
) )

View File

@ -32,10 +32,7 @@ include(Version)
add_library(version) add_library(version)
target_sources(version target_sources(version
PUBLIC PUBLIC
FILE_SET HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/version.h
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
FILES
${CMAKE_CURRENT_SOURCE_DIR}/version.h
PRIVATE PRIVATE
${CMAKE_BINARY_DIR}/version.cpp ${CMAKE_BINARY_DIR}/version.cpp
) )

View File

@ -35,10 +35,7 @@ list(APPEND BCDB_HEADERS lmdb/db_lmdb.h)
add_library(blockchain_db) add_library(blockchain_db)
target_sources(blockchain_db target_sources(blockchain_db
PUBLIC PUBLIC
FILE_SET HEADERS ${BCDB_HEADERS}
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../
FILES
${BCDB_HEADERS}
PRIVATE PRIVATE
${BCDB_SOURCES} ${BCDB_SOURCES}
) )

View File

@ -60,10 +60,7 @@ endforeach()
add_library(blocks) add_library(blocks)
target_sources(blocks target_sources(blocks
PUBLIC PUBLIC
FILE_SET HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/blocks.h
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
FILES
${CMAKE_CURRENT_SOURCE_DIR}/blocks.h
PRIVATE PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/blocks.cpp ${CMAKE_CURRENT_SOURCE_DIR}/blocks.cpp
${GENERATED_SOURCES} ${GENERATED_SOURCES}

View File

@ -29,10 +29,7 @@
add_library(checkpoints) add_library(checkpoints)
target_sources(checkpoints target_sources(checkpoints
PUBLIC PUBLIC
FILE_SET HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/checkpoints.h
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
FILES
${CMAKE_CURRENT_SOURCE_DIR}/checkpoints.h
PRIVATE PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/checkpoints.cpp ${CMAKE_CURRENT_SOURCE_DIR}/checkpoints.cpp
) )

View File

@ -33,10 +33,7 @@ add_library(common)
target_sources(common target_sources(common
PUBLIC PUBLIC
FILE_SET HEADERS ${COMMON_HEADERS}
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
FILES
${COMMON_HEADERS}
PRIVATE PRIVATE
${COMMON_SOURCES} ${COMMON_SOURCES}
) )

View File

@ -58,10 +58,7 @@ endif()
add_library(cncrypto) add_library(cncrypto)
target_sources(cncrypto target_sources(cncrypto
PUBLIC PUBLIC
FILE_SET HEADERS ${crypto_headers}
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
FILES
${crypto_headers}
PRIVATE PRIVATE
${crypto_sources} ${crypto_sources}
) )

View File

@ -33,10 +33,7 @@ check_language(ASM-ATT)
add_library(wallet-crypto crypto.h) add_library(wallet-crypto crypto.h)
target_sources(wallet-crypto target_sources(wallet-crypto
PUBLIC PUBLIC
FILE_SET HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/crypto.h
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
FILES
${CMAKE_CURRENT_SOURCE_DIR}/crypto.h
) )
target_include_directories(wallet-crypto target_include_directories(wallet-crypto

View File

@ -46,10 +46,7 @@ target_include_directories(cryptonote_format_utils_basic
add_library(cryptonote_basic) add_library(cryptonote_basic)
target_sources(cryptonote_basic target_sources(cryptonote_basic
PUBLIC PUBLIC
FILE_SET HEADERS ${CN_BASIC_HEADERS}
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../
FILES
${CN_BASIC_HEADERS}
PRIVATE PRIVATE
${CN_BASIC_SOURCES} ${CN_BASIC_SOURCES}
) )

View File

@ -57,10 +57,7 @@ endif()
target_sources(cryptonote_core target_sources(cryptonote_core
PUBLIC PUBLIC
FILE_SET HEADERS ${CN_CORE_HEADERS}
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../
FILES
${CN_CORE_HEADERS}
PRIVATE PRIVATE
${CN_CORE_SOURCES} ${CN_CORE_SOURCES}
) )

View File

@ -32,10 +32,7 @@ file(GLOB CN_PROT_SOURCES *.cpp *.c *.cc)
add_library(cryptonote_protocol) add_library(cryptonote_protocol)
target_sources(cryptonote_protocol target_sources(cryptonote_protocol
PUBLIC PUBLIC
FILE_SET HEADERS ${CN_PROT_HEADERS}
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
FILES
${CN_PROT_HEADERS}
PRIVATE PRIVATE
${CN_PROT_SOURCES} ${CN_PROT_SOURCES}
) )

View File

@ -29,14 +29,11 @@
add_library(device) add_library(device)
target_sources(device target_sources(device
PUBLIC PUBLIC
FILE_SET HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/device.hpp
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../ ${CMAKE_CURRENT_SOURCE_DIR}/device_io.hpp
FILES ${CMAKE_CURRENT_SOURCE_DIR}/device_default.hpp
${CMAKE_CURRENT_SOURCE_DIR}/device.hpp ${CMAKE_CURRENT_SOURCE_DIR}/device_cold.hpp
${CMAKE_CURRENT_SOURCE_DIR}/device_io.hpp ${CMAKE_CURRENT_SOURCE_DIR}/log.hpp
${CMAKE_CURRENT_SOURCE_DIR}/device_default.hpp
${CMAKE_CURRENT_SOURCE_DIR}/device_cold.hpp
${CMAKE_CURRENT_SOURCE_DIR}/log.hpp
PRIVATE PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/device.cpp ${CMAKE_CURRENT_SOURCE_DIR}/device.cpp
${CMAKE_CURRENT_SOURCE_DIR}/device_default.cpp ${CMAKE_CURRENT_SOURCE_DIR}/device_default.cpp

View File

@ -29,10 +29,7 @@
add_library(hardforks) add_library(hardforks)
target_sources(hardforks target_sources(hardforks
PUBLIC PUBLIC
FILE_SET HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/hardforks.h
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
FILES
${CMAKE_CURRENT_SOURCE_DIR}/hardforks.h
PRIVATE PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/hardforks.cpp ${CMAKE_CURRENT_SOURCE_DIR}/hardforks.cpp
) )

View File

@ -32,10 +32,7 @@ file(GLOB LMDB_SOURCES *.cpp *.c *.cc)
add_library(lmdb_lib ${LMDB_SOURCES}) add_library(lmdb_lib ${LMDB_SOURCES})
target_sources(lmdb_lib target_sources(lmdb_lib
PUBLIC PUBLIC
FILE_SET HEADERS ${LMDB_HEADERS}
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
FILES
${LMDB_HEADERS}
PRIVATE PRIVATE
${LMDB_SOURCES} ${LMDB_SOURCES}
) )

View File

@ -32,10 +32,7 @@ file(GLOB MN_SOURCES *.cpp *.c *.cc)
add_library(mnemonics) add_library(mnemonics)
target_sources(mnemonics target_sources(mnemonics
PUBLIC PUBLIC
FILE_SET HEADERS ${MN_HEADERS}
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
FILES
${MN_HEADERS}
PRIVATE PRIVATE
${MN_SOURCES} ${MN_SOURCES}
) )

View File

@ -34,10 +34,7 @@ file(GLOB MULTISIG_SOURCES
add_library(multisig) add_library(multisig)
target_sources(multisig target_sources(multisig
PUBLIC PUBLIC
FILE_SET HEADERS ${MULTISIG_HEADERS}
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
FILES
${MULTISIG_HEADERS}
PRIVATE PRIVATE
${MULTISIG_SOURCES} ${MULTISIG_SOURCES}
) )

View File

@ -33,10 +33,7 @@ file(GLOB NET_SOURCES *.cpp *.c *.cc)
add_library(net) add_library(net)
target_sources(net target_sources(net
PUBLIC PUBLIC
FILE_SET HEADERS ${NET_HEADERS}
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../
FILES
${NET_HEADERS}
PRIVATE PRIVATE
${NET_SOURCES} ${NET_SOURCES}
) )

View File

@ -32,10 +32,7 @@ file(GLOB P2P_SOURCES *.cpp *.c *.cc)
add_library(p2p) add_library(p2p)
target_sources(p2p target_sources(p2p
PUBLIC PUBLIC
FILE_SET HEADERS ${P2P_HEADERS}
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
FILES
${P2P_HEADERS}
PRIVATE PRIVATE
${P2P_SOURCES} ${P2P_SOURCES}
) )

View File

@ -47,10 +47,7 @@ set(ringct_basic_headers
add_library(ringct_basic) add_library(ringct_basic)
target_sources(ringct_basic target_sources(ringct_basic
PUBLIC PUBLIC
FILE_SET HEADERS ${ringct_basic_headers}
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
FILES
${ringct_basic_headers}
PRIVATE PRIVATE
${ringct_basic_sources} ${ringct_basic_sources}
) )
@ -72,10 +69,7 @@ target_include_directories(ringct_basic
add_library(ringct) add_library(ringct)
target_sources(ringct target_sources(ringct
PUBLIC PUBLIC
FILE_SET HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/rctSigs.h
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
FILES
${CMAKE_CURRENT_SOURCE_DIR}/rctSigs.h
PRIVATE PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/rctSigs.cpp ${CMAKE_CURRENT_SOURCE_DIR}/rctSigs.cpp
) )

View File

@ -31,12 +31,9 @@
add_library(rpc_base) add_library(rpc_base)
target_sources(rpc_base target_sources(rpc_base
PUBLIC PUBLIC
FILE_SET HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/rpc_args.h
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/rpc_payment_signature.h
FILES ${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 PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/rpc_args.cpp ${CMAKE_CURRENT_SOURCE_DIR}/rpc_args.cpp
${CMAKE_CURRENT_SOURCE_DIR}/rpc_payment_signature.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) add_library(rpc)
target_sources(rpc target_sources(rpc
PUBLIC PUBLIC
FILE_SET HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/rpc_version_str.h
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/rpc_handler.h
FILES ${CMAKE_CURRENT_SOURCE_DIR}/bootstrap_daemon.h
${CMAKE_CURRENT_SOURCE_DIR}/rpc_version_str.h ${CMAKE_CURRENT_SOURCE_DIR}/core_rpc_server.h
${CMAKE_CURRENT_SOURCE_DIR}/rpc_handler.h ${CMAKE_CURRENT_SOURCE_DIR}/rpc_payment.h
${CMAKE_CURRENT_SOURCE_DIR}/bootstrap_daemon.h ${CMAKE_CURRENT_SOURCE_DIR}/core_rpc_server_commands_defs.h
${CMAKE_CURRENT_SOURCE_DIR}/core_rpc_server.h ${CMAKE_CURRENT_SOURCE_DIR}/core_rpc_server_error_codes.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 PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/bootstrap_daemon.cpp ${CMAKE_CURRENT_SOURCE_DIR}/bootstrap_daemon.cpp
${CMAKE_CURRENT_SOURCE_DIR}/bootstrap_node_selector.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) add_library(rpc_pub)
target_sources(rpc_pub target_sources(rpc_pub
PUBLIC PUBLIC
FILE_SET HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/zmq_pub.h
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
FILES
${CMAKE_CURRENT_SOURCE_DIR}/zmq_pub.h
PRIVATE PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/zmq_pub.cpp ${CMAKE_CURRENT_SOURCE_DIR}/zmq_pub.cpp
) )

View File

@ -32,10 +32,7 @@ file(GLOB SER_SOURCES *.cpp *.c *.cc)
add_library(serialization) add_library(serialization)
target_sources(serialization target_sources(serialization
PUBLIC PUBLIC
FILE_SET HEADERS ${SER_HEADERS}
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../
FILES
${SER_HEADERS}
PRIVATE PRIVATE
${SER_SOURCES} ${SER_SOURCES}
) )

View File

@ -89,6 +89,6 @@ target_sources(wallet_api
${wallet_api_private_headers} ${wallet_api_private_headers}
${wallet_api_sources} ${wallet_api_sources}
PUBLIC 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/") monero_install_library(wallet_api "${CMAKE_INSTALL_INCLUDEDIR}/monero/wallet/api/")