From b874ea7324097a0df9c761238ca0b53c4d85a7d0 Mon Sep 17 00:00:00 2001
From: Lee Clagett <code@leeclagett.com>
Date: Sun, 23 Feb 2025 20:19:20 -0500
Subject: [PATCH] Fixing build (upstream ZMQ CMake changes)
---
CMakeLists.txt | 7 ++++---
tests/unit/scanner.test.cpp | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8edd8dc..708627d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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 ()
diff --git a/tests/unit/scanner.test.cpp b/tests/unit/scanner.test.cpp
index 3968ef1..b6a398b 100644
--- a/tests/unit/scanner.test.cpp
+++ b/tests/unit/scanner.test.cpp
@@ -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
)
);