Merge pull request #8642

8c53995 Fix static builds for Ubuntu 22.04 (AgoraDesk / LocalMonero)
This commit is contained in:
luigi1111 2022-12-01 01:13:30 -06:00
commit 8cb10345d6
No known key found for this signature in database
GPG key ID: F4ACA0183641E010

View file

@ -1178,6 +1178,9 @@ find_library(NORM_LIBRARY norm)
find_library(GSSAPI_LIBRARY gssapi_krb5) find_library(GSSAPI_LIBRARY gssapi_krb5)
find_library(PROTOLIB_LIBRARY protolib) find_library(PROTOLIB_LIBRARY protolib)
find_library(SODIUM_LIBRARY sodium) find_library(SODIUM_LIBRARY sodium)
find_library(BSD_LIBRARY bsd)
find_library(MD_LIBRARY md)
find_library(PROTOKIT_LIBRARY protokit)
if(NOT ZMQ_INCLUDE_PATH) if(NOT ZMQ_INCLUDE_PATH)
message(FATAL_ERROR "Could not find required header zmq.h") message(FATAL_ERROR "Could not find required header zmq.h")
@ -1200,6 +1203,15 @@ endif()
if(SODIUM_LIBRARY) if(SODIUM_LIBRARY)
set(ZMQ_LIB "${ZMQ_LIB};${SODIUM_LIBRARY}") set(ZMQ_LIB "${ZMQ_LIB};${SODIUM_LIBRARY}")
endif() endif()
if(BSD_LIBRARY)
set(ZMQ_LIB "${ZMQ_LIB};${BSD_LIBRARY}")
endif()
if(MD_LIBRARY)
set(ZMQ_LIB "${ZMQ_LIB};${MD_LIBRARY}")
endif()
if(PROTOKIT_LIBRARY)
set(ZMQ_LIB "${ZMQ_LIB};${PROTOKIT_LIBRARY}")
endif()
include(external/supercop/functions.cmake) # place after setting flags and before src directory inclusion include(external/supercop/functions.cmake) # place after setting flags and before src directory inclusion
add_subdirectory(contrib) add_subdirectory(contrib)