Merge pull request #2774

a3ea62f2 CMake: include RPC when building GUI deps (anonimal)
This commit is contained in:
Riccardo Spagni 2017-11-14 22:16:06 +02:00
commit 6e92354284
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 30 additions and 33 deletions

View File

@ -88,43 +88,40 @@ target_link_libraries(wallet
PRIVATE PRIVATE
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
if (NOT BUILD_GUI_DEPS) set(wallet_rpc_sources
set(wallet_rpc_sources wallet_rpc_server.cpp)
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) wallet_rpc_server.h)
monero_private_headers(wallet_rpc_server monero_private_headers(wallet_rpc_server
${wallet_rpc_private_headers}) ${wallet_rpc_private_headers})
monero_add_executable(wallet_rpc_server monero_add_executable(wallet_rpc_server
${wallet_rpc_sources} ${wallet_rpc_sources}
${wallet_rpc_headers} ${wallet_rpc_headers}
${wallet_rpc_private_headers}) ${wallet_rpc_private_headers})
target_link_libraries(wallet_rpc_server target_link_libraries(wallet_rpc_server
PRIVATE PRIVATE
wallet wallet
epee epee
${EPEE_READLINE} rpc
rpc cryptonote_core
cryptonote_core cncrypto
cncrypto common
common version
version ${Boost_CHRONO_LIBRARY}
${Boost_CHRONO_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_FILESYSTEM_LIBRARY}
${Boost_FILESYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY}
${Boost_THREAD_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}
${CMAKE_THREAD_LIBS_INIT} ${EXTRA_LIBRARIES})
${EXTRA_LIBRARIES}) set_property(TARGET wallet_rpc_server
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