Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-27 07:39:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2485

Browse Source 
a3691ae3 daemon: fix static building with libzmq (iDunk5400)
This commit is contained in:
Riccardo Spagni 2017-09-25 20:25:10 +02:00
commit 7b8398eed7
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -234,6 +234,7 @@ if(STATIC)
else() else()
set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES}) set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
endif() endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DZMQ_STATIC")
endif() endif()
# Set default blockchain storage location: # Set default blockchain storage location:
@ -691,12 +692,16 @@ include(version.cmake)
find_path(ZMQ_INCLUDE_PATH zmq.hpp) find_path(ZMQ_INCLUDE_PATH zmq.hpp)
find_library(ZMQ_LIB zmq) find_library(ZMQ_LIB zmq)
find_library(SODIUM_LIBRARY sodium)
if(NOT ZMQ_INCLUDE_PATH) if(NOT ZMQ_INCLUDE_PATH)
message(FATAL_ERROR "Could not find required header zmq.hpp") message(FATAL_ERROR "Could not find required header zmq.hpp")
endif() endif()
if(NOT ZMQ_LIB) if(NOT ZMQ_LIB)
message(FATAL_ERROR "Could not find require libzmq") message(FATAL_ERROR "Could not find required libzmq")
endif()
if(SODIUM_LIBRARY)
set(ZMQ_LIB "${ZMQ_LIB};${SODIUM_LIBRARY}")
endif() endif()
option(BUILD_TESTS "Build tests." OFF) option(BUILD_TESTS "Build tests." OFF)