Fix Github CI (#99)

This commit is contained in:
Lee *!* Clagett 2024-02-26 20:36:55 -05:00 committed by GitHub
parent 8779401b93
commit ec70d23944
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -116,7 +116,7 @@ load_cache(${MONERO_BUILD_DIR} READ_WITH_PREFIX monero_
OPENSSL_INCLUDE_DIR OPENSSL_INCLUDE_DIR
OPENSSL_CRYPTO_LIBRARY OPENSSL_CRYPTO_LIBRARY
OPENSSL_SSL_LIBRARY OPENSSL_SSL_LIBRARY
SODIUM_LIBRARY sodium_LIBRARY_RELEASE
UNBOUND_LIBRARIES UNBOUND_LIBRARIES
ZMQ_INCLUDE_PATH ZMQ_INCLUDE_PATH
ZMQ_LIB ZMQ_LIB
@ -124,7 +124,6 @@ load_cache(${MONERO_BUILD_DIR} READ_WITH_PREFIX monero_
NORM_LIBRARY NORM_LIBRARY
GSSAPI_LIBRARY GSSAPI_LIBRARY
PROTOLIB_LIBRARY PROTOLIB_LIBRARY
SODIUM_LIBRARY
) )
if (NOT (monero_monero_SOURCE_DIR MATCHES "${MONERO_SOURCE_DIR}(/src/cryptonote_protocol)")) if (NOT (monero_monero_SOURCE_DIR MATCHES "${MONERO_SOURCE_DIR}(/src/cryptonote_protocol)"))
@ -192,8 +191,8 @@ endif()
if(monero_PROTOLIB_LIBRARY) if(monero_PROTOLIB_LIBRARY)
set(ZMQ_LIB "${ZMQ_LIB};${monero_PROTOLIB_LIBRARY}") set(ZMQ_LIB "${ZMQ_LIB};${monero_PROTOLIB_LIBRARY}")
endif() endif()
if(monero_SODIUM_LIBRARY) if(monero_sodium_LIBRARY_RELEASE)
set(ZMQ_LIB "${ZMQ_LIB};${monero_SODIUM_LIBRARY}") set(ZMQ_LIB "${ZMQ_LIB};${monero_sodium_LIBRARY_RELEASE}")
endif() endif()
if(STATIC AND NOT IOS) if(STATIC AND NOT IOS)
@ -252,7 +251,7 @@ set_property(TARGET monero::libraries PROPERTY
${monero_LIBUDEV_LIBRARY} ${monero_LIBUDEV_LIBRARY}
${monero_OPENSSL_SSL_LIBRARY} ${monero_OPENSSL_SSL_LIBRARY}
${monero_OPENSSL_CRYPTO_LIBRARY} ${monero_OPENSSL_CRYPTO_LIBRARY}
${monero_SODIUM_LIBRARY} ${monero_sodium_LIBRARY_RELEASE}
${monero_UNBOUND_LIBRARIES} ${monero_UNBOUND_LIBRARIES}
${CMAKE_DL_LIBS} ${CMAKE_DL_LIBS}
) )