diff options
author | Bertrand Jacquin <bertrand@jacquin.bzh> | 2020-05-03 00:48:24 +0100 |
---|---|---|
committer | Bertrand Jacquin <bertrand@jacquin.bzh> | 2020-05-03 00:48:24 +0100 |
commit | 4029d621150ffef5352953f6f8647958e628a1d1 (patch) | |
tree | c52dc12f94b7b4b8ac2e1e0e2a4a07e2d0784a09 /src | |
parent | Merge pull request #6451 (diff) | |
download | monero-4029d621150ffef5352953f6f8647958e628a1d1.tar.xz |
build: rely on pkg-config to find zmqdev/beber/pgm
if zmq was built with libnorm, libproto or libpgm, pkg-config can inform
us directly instead of having to find them.
Diffstat (limited to '')
-rw-r--r-- | src/daemon/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/net/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/rpc/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt index d9bfd9a20..1d5e3e85c 100644 --- a/src/daemon/CMakeLists.txt +++ b/src/daemon/CMakeLists.txt @@ -88,7 +88,7 @@ target_link_libraries(daemon ${Boost_REGEX_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} - ${ZMQ_LIB} + ${ZMQ_LIBRARIES} ${GNU_READLINE_LIBRARY} ${EXTRA_LIBRARIES} ${Blocks}) diff --git a/src/net/CMakeLists.txt b/src/net/CMakeLists.txt index 1ce7118ad..7a87f4d3d 100644 --- a/src/net/CMakeLists.txt +++ b/src/net/CMakeLists.txt @@ -32,5 +32,5 @@ set(net_headers dandelionpp.h error.h i2p_address.h parse.h socks.h socks_connec tor_address.h zmq.h) monero_add_library(net ${net_sources} ${net_headers}) -target_link_libraries(net common epee ${ZMQ_LIB} ${Boost_ASIO_LIBRARY}) +target_link_libraries(net common epee ${ZMQ_LIBRARIES} ${Boost_ASIO_LIBRARY}) diff --git a/src/rpc/CMakeLists.txt b/src/rpc/CMakeLists.txt index fe5e5a85b..a6b035a2b 100644 --- a/src/rpc/CMakeLists.txt +++ b/src/rpc/CMakeLists.txt @@ -151,7 +151,7 @@ target_link_libraries(daemon_rpc_server ${Boost_REGEX_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY} - ${ZMQ_LIB} + ${ZMQ_LIBRARIES} ${EXTRA_LIBRARIES}) target_include_directories(daemon_rpc_server PUBLIC ${ZMQ_INCLUDE_PATH}) target_include_directories(obj_daemon_rpc_server PUBLIC ${ZMQ_INCLUDE_PATH}) |