monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 12:09:54 +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

4
src/CMakeLists.txt
View file

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

3
src/wallet/CMakeLists.txt
View file

@ -77,6 +77,7 @@ target_link_libraries(wallet
PRIVATE PRIVATE
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
if(NOT IOS)
set(wallet_rpc_sources set(wallet_rpc_sources
wallet_rpc_server.cpp) wallet_rpc_server.cpp)
@ -112,7 +113,7 @@ set_property(TARGET wallet_rpc_server
PROPERTY PROPERTY
OUTPUT_NAME "monero-wallet-rpc") 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 # build and install libwallet_merged only if we building for GUI
if (BUILD_GUI_DEPS) if (BUILD_GUI_DEPS)