Merge pull request #1331

e1dd15b Don't build monero-wallet-rpc when building the GUI (iDunk5400)
This commit is contained in:
Riccardo Spagni 2016-11-13 11:32:23 +02:00
commit 56c4514486
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD

View file

@ -82,39 +82,41 @@ target_link_libraries(wallet
${EXTRA_LIBRARIES}) ${EXTRA_LIBRARIES})
add_dependencies(wallet version) add_dependencies(wallet version)
set(wallet_rpc_sources if (NOT BUILD_GUI_DEPS)
wallet_rpc_server.cpp) 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) 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
rpc rpc
cryptonote_core cryptonote_core
crypto crypto
common common
${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})
add_dependencies(wallet_rpc_server version) add_dependencies(wallet_rpc_server version)
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