mirror of
https://github.com/dashpay/dash.git
synced 2024-12-26 20:42:59 +01:00
e2b24461d4
0388ad0d65b6c9ee802ca641eb01d69fcdd5605d depends: switch zmq to CMake (Cory Fields)
fefb3bbe5b538f8faa59de191914ad0c22c3ade6 depends: add zeromq no librt patch (fanquake)
a522ef15424110f76172b3c0603fa08f7291c9fc depends: add zeromq cmake minimum patch (fanquake)
cbbc229adf4c12ad4bd7edde71425b8ef217edfc depends: add zeromq windows usage patch (fanquake)
2de68d6d388b9a33c57234d3161f6ffc4c2a0246 depends: add zeromq builtin sha1 patch (fanquake)
0c8605253ae887dac316264cb969b752027d277a depends: add zeromq mktemp macos patch (fanquake)
Pull request description:
This picks up a change, which is a switch to building zeromq with CMake. It includes a number of patches, some which have already been upstreamed (see each patch for details).
ACKs for top commit:
hebasto:
ACK 0388ad0d65b6c9ee802ca641eb01d69fcdd5605d.
Tree-SHA512: 5567e432b4e4e0446c41d502bd61810a80b329dea2399b5d9d9f6e79acc450d1c6ba861c8238ba895de98338cfc5dc44ad2bf86ee8c222ecb3fbf47d6eb60da4
18 lines
553 B
Diff
18 lines
553 B
Diff
Don't use builtin sha1 if not using ws
|
|
|
|
The builtin SHA1 (ZMQ_USE_BUILTIN_SHA1) is only used in the websocket
|
|
engine (ws_engine.cpp).
|
|
Upstreamed in https://github.com/zeromq/libzmq/pull/4670.
|
|
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -234,7 +234,7 @@ if(NOT ZMQ_USE_GNUTLS)
|
|
endif()
|
|
endif()
|
|
endif()
|
|
- if(NOT ZMQ_USE_NSS)
|
|
+ if(ENABLE_WS AND NOT ZMQ_USE_NSS)
|
|
list(APPEND sources ${CMAKE_CURRENT_SOURCE_DIR}/external/sha1/sha1.c
|
|
${CMAKE_CURRENT_SOURCE_DIR}/external/sha1/sha1.h)
|
|
message(STATUS "Using builtin sha1")
|