Wallets now do not depend on the daemon rpc lib

The shared RPC code is now moved off into a separate lib
This commit is contained in:
moneromooo-monero 2017-11-29 19:31:38 +00:00
parent bb89ae8b20
commit 43f5269f84
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
3 changed files with 23 additions and 4 deletions

View File

@ -26,9 +26,11 @@
# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
set(rpc_base_sources
rpc_args.cpp)
set(rpc_sources set(rpc_sources
core_rpc_server.cpp core_rpc_server.cpp
rpc_args.cpp
instanciations) instanciations)
set(daemon_messages_sources set(daemon_messages_sources
@ -40,9 +42,11 @@ set(daemon_rpc_server_sources
zmq_server.cpp) zmq_server.cpp)
set(rpc_headers set(rpc_base_headers
rpc_args.h) rpc_args.h)
set(rpc_headers)
set(daemon_rpc_server_headers) set(daemon_rpc_server_headers)
@ -70,6 +74,11 @@ monero_private_headers(daemon_rpc_server
${daemon_rpc_server_private_headers}) ${daemon_rpc_server_private_headers})
monero_add_library(rpc_base
${rpc_base_sources}
${rpc_base_headers}
${rpc_base_private_headers})
monero_add_library(rpc monero_add_library(rpc
${rpc_sources} ${rpc_sources}
${rpc_headers} ${rpc_headers}
@ -86,8 +95,18 @@ monero_add_library(daemon_rpc_server
${daemon_rpc_server_private_headers}) ${daemon_rpc_server_private_headers})
target_link_libraries(rpc_base
PUBLIC
common
epee
${Boost_REGEX_LIBRARY}
${Boost_THREAD_LIBRARY}
PRIVATE
${EXTRA_LIBRARIES})
target_link_libraries(rpc target_link_libraries(rpc
PUBLIC PUBLIC
rpc_base
common common
cryptonote_core cryptonote_core
cryptonote_protocol cryptonote_protocol

View File

@ -43,7 +43,7 @@ monero_add_executable(simplewallet
target_link_libraries(simplewallet target_link_libraries(simplewallet
PRIVATE PRIVATE
wallet wallet
rpc rpc_base
cryptonote_core cryptonote_core
cncrypto cncrypto
common common

View File

@ -82,7 +82,7 @@ target_link_libraries(wallet_rpc_server
PRIVATE PRIVATE
wallet wallet
epee epee
rpc rpc_base
cryptonote_core cryptonote_core
cncrypto cncrypto
common common