mirror of
https://github.com/vtnerd/monero-lws.git
synced 2025-04-14 01:11:54 +00:00
Fixing build (upstream ZMQ CMake changes)
This commit is contained in:
parent
d8ee984b3c
commit
b874ea7324
2 changed files with 5 additions and 4 deletions
|
@ -115,16 +115,16 @@ load_cache(${MONERO_BUILD_DIR} READ_WITH_PREFIX monero_
|
|||
usb_LIBRARY
|
||||
HIDAPI_INCLUDE_DIR
|
||||
HIDAPI_LIBRARY
|
||||
libzmq_INCLUDE_DIRS
|
||||
LMDB_INCLUDE
|
||||
monero_SOURCE_DIR
|
||||
OPENSSL_INCLUDE_DIR
|
||||
OPENSSL_CRYPTO_LIBRARY
|
||||
OPENSSL_SSL_LIBRARY
|
||||
pkgcfg_lib_libzmq_zmq
|
||||
sodium_LIBRARY_RELEASE
|
||||
SODIUM_LIBRARY
|
||||
UNBOUND_LIBRARIES
|
||||
ZMQ_INCLUDE_PATH
|
||||
ZMQ_LIB
|
||||
PGM_LIBRARY
|
||||
NORM_LIBRARY
|
||||
GSSAPI_LIBRARY
|
||||
|
@ -179,7 +179,8 @@ endif()
|
|||
|
||||
set(LMDB_INCLUDE "${monero_LMDB_INCLUDE}")
|
||||
set(LMDB_LIB_PATH "monero::lmdb")
|
||||
set(ZMQ_LIB "${monero_ZMQ_LIB}")
|
||||
set(ZMQ_INCLUDE_PATH "${libzmq_INCLUDE_DIRS}")
|
||||
set(ZMQ_LIB "${monero_pkgcfg_lib_libzmq_zmq}")
|
||||
if (monero_SODIUM_LIBRARY)
|
||||
set(SODIUM_LIBRARY "${monero_SODIUM_LIBRARY}")
|
||||
else ()
|
||||
|
|
|
@ -195,7 +195,7 @@ namespace
|
|||
EXPECT(
|
||||
cryptonote::construct_tx_and_get_tx_key(
|
||||
keys, subaddresses, sources, destinations, keys.m_account_address, {}, out.tx, /* 0, */ unused_key,
|
||||
out.additional_keys, true, {rct::RangeProofType::RangeProofBulletproof, 2}, use_view_tag
|
||||
out.additional_keys, true, {rct::RangeProofType::RangeProofPaddedBulletproof, 2}, use_view_tag
|
||||
)
|
||||
);
|
||||
|
||||
|
|
Loading…
Reference in a new issue