diff options
| author | Bertrand Jacquin <bertrand@jacquin.bzh> | 2020-05-03 00:48:24 +0100 |
|---|---|---|
| committer | Bertrand Jacquin <bertrand@jacquin.bzh> | 2020-05-03 01:39:46 +0100 |
| commit | eb8c550cbc9fe4abfb3002d81f07be6dfbabc5a4 (patch) | |
| tree | 73990f8934ace74060c192bf817474e701aebeb1 /src | |
| parent | https://sourceware.org/bugzilla/show_bug.cgi?id=25210 (diff) | |
| download | monero-eb8c550cbc9fe4abfb3002d81f07be6dfbabc5a4.tar.xz | |
build: rely on pkg-config to find zmq and sodiumv0.15.0.5
if zmq was built with libnorm, libproto or libpgm, pkg-config can inform
us directly instead of having to find them. The location of zmq.h can be
obtained the same way
motivation is to remove opengpm from the list of mandatory dependencies
when monero does not have direct dependency on opengpm, but only when
zeromq is buily with pgm support which itself has hard dependency on
pyton2 which is now EOL.
Diffstat (limited to '')
| -rw-r--r-- | src/crypto/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/daemon/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/device_trezor/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/net/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/rpc/CMakeLists.txt | 7 |
5 files changed, 4 insertions, 8 deletions
diff --git a/src/crypto/CMakeLists.txt b/src/crypto/CMakeLists.txt index 80f1e5d7e..d66b7d9dd 100644 --- a/src/crypto/CMakeLists.txt +++ b/src/crypto/CMakeLists.txt @@ -91,7 +91,6 @@ target_link_libraries(cncrypto epee randomx ${Boost_SYSTEM_LIBRARY} - ${SODIUM_LIBRARY} PRIVATE ${EXTRA_LIBRARIES}) diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt index d9bfd9a20..bf373029d 100644 --- a/src/daemon/CMakeLists.txt +++ b/src/daemon/CMakeLists.txt @@ -88,7 +88,6 @@ target_link_libraries(daemon ${Boost_REGEX_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} - ${ZMQ_LIB} ${GNU_READLINE_LIBRARY} ${EXTRA_LIBRARIES} ${Blocks}) diff --git a/src/device_trezor/CMakeLists.txt b/src/device_trezor/CMakeLists.txt index 250939da7..293d80fd9 100644 --- a/src/device_trezor/CMakeLists.txt +++ b/src/device_trezor/CMakeLists.txt @@ -88,7 +88,6 @@ if(DEVICE_TREZOR_READY) ringct_basic cryptonote_core common - ${SODIUM_LIBRARY} ${Boost_CHRONO_LIBRARY} ${Protobuf_LIBRARY} ${TREZOR_LIBUSB_LIBRARIES} 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 ebb1e767f..57408140c 100644 --- a/src/rpc/CMakeLists.txt +++ b/src/rpc/CMakeLists.txt @@ -26,7 +26,7 @@ # STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF # THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -include_directories(SYSTEM ${ZMQ_INCLUDE_PATH}) +include_directories(SYSTEM ${ZMQ_INCLUDE_DIRS}) set(rpc_base_sources rpc_args.cpp @@ -148,7 +148,6 @@ target_link_libraries(daemon_rpc_server ${Boost_REGEX_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY} - ${ZMQ_LIB} ${EXTRA_LIBRARIES}) -target_include_directories(daemon_rpc_server PUBLIC ${ZMQ_INCLUDE_PATH}) -target_include_directories(obj_daemon_rpc_server PUBLIC ${ZMQ_INCLUDE_PATH}) +target_include_directories(daemon_rpc_server PUBLIC ${ZMQ_INCLUDE_DIRS}) +target_include_directories(obj_daemon_rpc_server PUBLIC ${ZMQ_INCLUDE_DIRS}) |