mirror of
https://github.com/dashpay/dash.git
synced 2024-12-27 13:03:17 +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
55 lines
1.4 KiB
Diff
55 lines
1.4 KiB
Diff
We don't use librt, so don't try and link against it.
|
|
|
|
Related to: https://github.com/zeromq/libzmq/pull/4702.
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 03462271..87ceab3c 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -564,13 +564,6 @@ else()
|
|
check_cxx_symbol_exists(SO_BUSY_POLL sys/socket.h ZMQ_HAVE_BUSY_POLL)
|
|
endif()
|
|
|
|
-if(NOT MINGW)
|
|
- find_library(RT_LIBRARY rt)
|
|
- if(RT_LIBRARY)
|
|
- set(pkg_config_libs_private "${pkg_config_libs_private} -lrt")
|
|
- endif()
|
|
-endif()
|
|
-
|
|
find_package(Threads)
|
|
|
|
if(WIN32 AND NOT CYGWIN)
|
|
@@ -588,9 +581,7 @@ if(WIN32 AND NOT CYGWIN)
|
|
endif()
|
|
|
|
if(NOT MSVC)
|
|
- set(CMAKE_REQUIRED_LIBRARIES rt)
|
|
check_cxx_symbol_exists(clock_gettime time.h HAVE_CLOCK_GETTIME)
|
|
- set(CMAKE_REQUIRED_LIBRARIES)
|
|
|
|
check_cxx_symbol_exists(fork unistd.h HAVE_FORK)
|
|
check_cxx_symbol_exists(gethrtime sys/time.h HAVE_GETHRTIME)
|
|
@@ -1503,10 +1494,6 @@ if(BUILD_SHARED)
|
|
target_link_libraries(libzmq iphlpapi)
|
|
endif()
|
|
|
|
- if(RT_LIBRARY)
|
|
- target_link_libraries(libzmq -lrt)
|
|
- endif()
|
|
-
|
|
if(norm_FOUND)
|
|
target_link_libraries(libzmq norm::norm)
|
|
endif()
|
|
@@ -1553,10 +1540,6 @@ if(BUILD_STATIC)
|
|
target_link_libraries(libzmq-static iphlpapi)
|
|
endif()
|
|
|
|
- if(RT_LIBRARY)
|
|
- target_link_libraries(libzmq-static -lrt)
|
|
- endif()
|
|
-
|
|
if(CMAKE_SYSTEM_NAME MATCHES "QNX")
|
|
add_definitions(-DUNITY_EXCLUDE_MATH_H)
|
|
endif()
|