diff --git a/thirdparty/libzmq/CMakeLists.txt b/thirdparty/libzmq/CMakeLists.txt index 62b236f554..e20569c860 100644 --- a/thirdparty/libzmq/CMakeLists.txt +++ b/thirdparty/libzmq/CMakeLists.txt @@ -1,8 +1,3 @@ -list(APPEND PATCH_FILES - android.patch - cmake_tweaks.patch -) - list(APPEND CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} # Project options. @@ -33,11 +28,11 @@ list(APPEND BUILD_CMD COMMAND ninja) list(APPEND INSTALL_CMD COMMAND ${CMAKE_COMMAND} --install .) -append_shared_lib_install_commands(INSTALL_CMD zmq VERSION 4) +append_shared_lib_install_commands(INSTALL_CMD zmq VERSION 5) external_project( - DOWNLOAD GIT 883e95b22e0bffffa72312ea1fec76199afbe458 - https://github.com/zeromq/libzmq + DOWNLOAD URL ae933b1e98411fd7cb8309f9502d2737 + https://github.com/zeromq/libzmq/releases/download/v4.3.5/zeromq-4.3.5.tar.gz PATCH_FILES ${PATCH_FILES} CMAKE_ARGS ${CMAKE_ARGS} BUILD_COMMAND ${BUILD_CMD} diff --git a/thirdparty/libzmq/android.patch b/thirdparty/libzmq/android.patch deleted file mode 100644 index 617d771def..0000000000 --- a/thirdparty/libzmq/android.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/builds/cmake/platform.hpp.in -+++ b/builds/cmake/platform.hpp.in -@@ -36,7 +36,7 @@ - #define ZMQ_HAVE_AIX - #endif - --#if defined ANDROID -+#if defined __ANDROID__ - #define ZMQ_HAVE_ANDROID - #endif - diff --git a/thirdparty/libzmq/cmake_tweaks.patch b/thirdparty/libzmq/cmake_tweaks.patch deleted file mode 100644 index 75e424ab98..0000000000 --- a/thirdparty/libzmq/cmake_tweaks.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- i/CMakeLists.txt -+++ w/CMakeLists.txt -@@ -1,6 +1,6 @@ - # CMake build script for ZeroMQ - --cmake_minimum_required(VERSION 2.8) -+cmake_minimum_required(VERSION 3.15) - project(ZeroMQ) - - option(WITH_OPENPGM "Build with support for OpenPGM" OFF) -@@ -125,8 +125,6 @@ check_library_exists(iphlpapi printf "" HAVE_IPHLAPI) # GetAdaptersAddresses - check_cxx_symbol_exists(SO_PEERCRED sys/socket.h ZMQ_HAVE_SO_PEERCRED) - check_cxx_symbol_exists(LOCAL_PEERCRED sys/socket.h ZMQ_HAVE_LOCAL_PEERCRED) - --find_library(RT_LIBRARY rt) -- - find_package(Threads) - - -@@ -266,10 +264,6 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin") - add_definitions(-D_DARWIN_C_SOURCE) - endif() - --set(CMAKE_PYTHON_VERSION 2.7 2.6 2.5 2.4) --find_package(PythonInterp) --find_package(AsciiDoc) -- - cmake_dependent_option(WITH_DOC "Build Reference Guide documentation(requires DocBook)" ON - "PYTHON_FOUND;ASCIIDOC_FOUND" OFF) - -@@ -609,6 +603,7 @@ else() - else() - set_target_properties(libzmq PROPERTIES - OUTPUT_NAME "zmq" -+ VERSION 4 - PUBLIC_HEADER "${public_headers}") - endif() - endif() -@@ -628,8 +623,8 @@ if(HAVE_IPHLAPI) - target_link_libraries(libzmq iphlpapi) - endif() - --if(RT_LIBRARY) -- target_link_libraries(libzmq ${RT_LIBRARY}) -+if(HAVE_CLOCK_GETTIME) -+ target_link_libraries(libzmq -lrt) - endif() - - set(perf-tools local_lat