From d9c9a75fc2b3de63f55429053eaf5e64b25d5e99 Mon Sep 17 00:00:00 2001 From: Lee *!* Clagett <code@leeclagett.com> Date: Mon, 8 Apr 2024 14:56:53 -0400 Subject: [PATCH] Revert "Fix Github CI (#99)" This reverts commit ecbd5d2bb24ee92f54757849c3eb0658dc03caa1. --- CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5336d84..4db200c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -116,7 +116,7 @@ load_cache(${MONERO_BUILD_DIR} READ_WITH_PREFIX monero_ OPENSSL_INCLUDE_DIR OPENSSL_CRYPTO_LIBRARY OPENSSL_SSL_LIBRARY - sodium_LIBRARY_RELEASE + SODIUM_LIBRARY UNBOUND_LIBRARIES ZMQ_INCLUDE_PATH ZMQ_LIB @@ -124,6 +124,7 @@ load_cache(${MONERO_BUILD_DIR} READ_WITH_PREFIX monero_ NORM_LIBRARY GSSAPI_LIBRARY PROTOLIB_LIBRARY + SODIUM_LIBRARY ) if (NOT (monero_monero_SOURCE_DIR MATCHES "${MONERO_SOURCE_DIR}(/src/cryptonote_protocol)")) @@ -191,8 +192,8 @@ endif() if(monero_PROTOLIB_LIBRARY) set(ZMQ_LIB "${ZMQ_LIB};${monero_PROTOLIB_LIBRARY}") endif() -if(monero_sodium_LIBRARY_RELEASE) - set(ZMQ_LIB "${ZMQ_LIB};${monero_sodium_LIBRARY_RELEASE}") +if(monero_SODIUM_LIBRARY) + set(ZMQ_LIB "${ZMQ_LIB};${monero_SODIUM_LIBRARY}") endif() if(STATIC AND NOT IOS) @@ -251,7 +252,7 @@ set_property(TARGET monero::libraries PROPERTY ${monero_LIBUDEV_LIBRARY} ${monero_OPENSSL_SSL_LIBRARY} ${monero_OPENSSL_CRYPTO_LIBRARY} - ${monero_sodium_LIBRARY_RELEASE} + ${monero_SODIUM_LIBRARY} ${monero_UNBOUND_LIBRARIES} ${CMAKE_DL_LIBS} )