monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 03:59:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6112

Browse source 
7c1d31b0 build: fix IOS, build blockchain_db and rpc, skip wallet_rpc_server (xiphon)
This commit is contained in:
Alexander Blair 2020-01-11 18:10:43 -08:00
commit e49a055e89
No known key found for this signature in database
GPG key ID: C64552D877C32479
2 changed files with 35 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/CMakeLists.txt
View file

@ -113,12 +113,10 @@ add_subdirectory(lmdb)
add_subdirectory(multisig)
add_subdirectory(net)
add_subdirectory(hardforks)
if(NOT IOS)
add_subdirectory(blockchain_db)
endif()
add_subdirectory(blockchain_db)
add_subdirectory(mnemonics)
add_subdirectory(rpc)
if(NOT IOS)
add_subdirectory(rpc)
add_subdirectory(serialization)
endif()
add_subdirectory(wallet)

19
src/wallet/CMakeLists.txt
View file

@ -77,22 +77,23 @@ target_link_libraries(wallet
PRIVATE
${EXTRA_LIBRARIES})
set(wallet_rpc_sources
if(NOT IOS)
set(wallet_rpc_sources
wallet_rpc_server.cpp)
set(wallet_rpc_headers)
set(wallet_rpc_headers)
set(wallet_rpc_private_headers
set(wallet_rpc_private_headers
wallet_rpc_server.h)
monero_private_headers(wallet_rpc_server
monero_private_headers(wallet_rpc_server
${wallet_rpc_private_headers})
monero_add_executable(wallet_rpc_server
monero_add_executable(wallet_rpc_server
${wallet_rpc_sources}
${wallet_rpc_headers}
${wallet_rpc_private_headers})
target_link_libraries(wallet_rpc_server
target_link_libraries(wallet_rpc_server
PRIVATE
wallet
rpc_base
@ -108,11 +109,11 @@ target_link_libraries(wallet_rpc_server
${Boost_THREAD_LIBRARY}
${CMAKE_THREAD_LIBS_INIT}
${EXTRA_LIBRARIES})
set_property(TARGET wallet_rpc_server
set_property(TARGET wallet_rpc_server
PROPERTY
OUTPUT_NAME "monero-wallet-rpc")
install(TARGETS wallet_rpc_server DESTINATION bin)
install(TARGETS wallet_rpc_server DESTINATION bin)
endif()
# build and install libwallet_merged only if we building for GUI
if (BUILD_GUI_DEPS)