such-gitea/wownero-lws
1
0
Fork 1
mirror of https://codeberg.org/wownero/wownero-lws synced 2026-01-09 23:25:16 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fixing build (upstream ZMQ CMake changes) (#155)

Browse Source
This commit is contained in:
Lee *!* Clagett
2025-02-24 17:55:42 -05:00
committed by Lee *!* Clagett
parent b5d0844bbd
commit b1421f55ad
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@@ -115,16 +115,16 @@ load_cache(${MONERO_BUILD_DIR} READ_WITH_PREFIX monero_
usb_LIBRARY usb_LIBRARY
HIDAPI_INCLUDE_DIR HIDAPI_INCLUDE_DIR
HIDAPI_LIBRARY HIDAPI_LIBRARY
libzmq_INCLUDE_DIRS
LMDB_INCLUDE LMDB_INCLUDE
monero_SOURCE_DIR monero_SOURCE_DIR
OPENSSL_INCLUDE_DIR OPENSSL_INCLUDE_DIR
OPENSSL_CRYPTO_LIBRARY OPENSSL_CRYPTO_LIBRARY
OPENSSL_SSL_LIBRARY OPENSSL_SSL_LIBRARY
pkgcfg_lib_libzmq_zmq
sodium_LIBRARY_RELEASE sodium_LIBRARY_RELEASE
SODIUM_LIBRARY SODIUM_LIBRARY
UNBOUND_LIBRARIES UNBOUND_LIBRARIES
ZMQ_INCLUDE_PATH
ZMQ_LIB
PGM_LIBRARY PGM_LIBRARY
NORM_LIBRARY NORM_LIBRARY
GSSAPI_LIBRARY GSSAPI_LIBRARY
@@ -179,7 +179,8 @@ endif()
set(LMDB_INCLUDE "${monero_LMDB_INCLUDE}") set(LMDB_INCLUDE "${monero_LMDB_INCLUDE}")
set(LMDB_LIB_PATH "monero::lmdb") 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) if (monero_SODIUM_LIBRARY)
set(SODIUM_LIBRARY "${monero_SODIUM_LIBRARY}") set(SODIUM_LIBRARY "${monero_SODIUM_LIBRARY}")
else () else ()

2
tests/unit/scanner.test.cpp
View File

@@ -195,7 +195,7 @@ namespace
EXPECT( EXPECT(
cryptonote::construct_tx_and_get_tx_key( cryptonote::construct_tx_and_get_tx_key(
keys, subaddresses, sources, destinations, keys.m_account_address, {}, out.tx, /* 0, */ unused_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
) )
); );