-
Notifications
You must be signed in to change notification settings - Fork 105
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
czmq & libzmq: update to 4.2.1 & 4.3.5 respectively
- Loading branch information
1 parent
cd3ffc4
commit 99ddf05
Showing
11 changed files
with
108 additions
and
197 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -89,6 +89,7 @@ | ||
| if(HAVE_CLOCK_GETTIME) | ||
| list(APPEND MORE_LIBRARIES -lrt) | ||
| endif() | ||
| +list(APPEND MORE_LIBRARIES -llog) | ||
|
|
||
| ######################################################################## | ||
| # ZMQ dependency |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,41 +1,41 @@ | ||
| --- i/CMakeLists.txt | ||
| +++ w/CMakeLists.txt | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -6,7 +6,7 @@ | ||
| ######################################################################## | ||
| # Project setup | ||
| ######################################################################## | ||
| -cmake_minimum_required(VERSION 2.8) | ||
| -cmake_minimum_required(VERSION 2.8.12) | ||
| +cmake_minimum_required(VERSION 3.15) | ||
| project(czmq) | ||
| enable_language(C) | ||
| enable_testing() | ||
| @@ -64,6 +64,12 @@ if (MINGW) | ||
| set(MORE_LIBRARIES -lws2_32 -lrpcrt4 -liphlpapi) | ||
| @@ -123,6 +123,13 @@ | ||
| set(MORE_LIBRARIES) | ||
| endif() | ||
|
|
||
| +if (LINUX) | ||
| + set(THREADS_PREFER_PTHREAD_FLAG TRUE) | ||
| + find_package(Threads REQUIRED) | ||
| + set(MORE_LIBRARIES Threads::Threads) | ||
| +set(CMAKE_REQUIRED_LIBRARIES -lrt) | ||
| +check_symbol_exists(clock_gettime "time.h" HAVE_CLOCK_GETTIME) | ||
| +set(CMAKE_REQUIRED_LIBRARIES) | ||
| +if(HAVE_CLOCK_GETTIME) | ||
| + list(APPEND MORE_LIBRARIES -lrt) | ||
| +endif() | ||
| + | ||
| list(APPEND CMAKE_MODULE_PATH "${SOURCE_DIR}") | ||
| set(OPTIONAL_LIBRARIES) | ||
| set(OPTIONAL_LIBRARIES_STATIC) | ||
| @@ -544,6 +549,7 @@ | ||
| ######################################################################## | ||
| # zeromq depedency | ||
| # executables | ||
| ######################################################################## | ||
| @@ -103,7 +103,7 @@ set (czmq_headers | ||
| include/zstr.h | ||
| include/zsys.h | ||
| include/zuuid.h | ||
| - include/zgossip_msg.h | ||
| + src/zgossip_msg.h | ||
| include/zctx.h | ||
| include/zmonitor.h | ||
| include/zmutex.h | ||
| @@ -159,6 +159,7 @@ set (czmq_sources | ||
| source_group ("Source Files" FILES ${czmq_sources}) | ||
| add_library(czmq SHARED ${czmq_sources}) | ||
| set_target_properties(czmq PROPERTIES DEFINE_SYMBOL "LIBCZMQ_EXPORTS") | ||
| +set_target_properties(czmq PROPERTIES VERSION 1) | ||
| target_link_libraries(czmq ${ZEROMQ_LIBRARIES} ${MORE_LIBRARIES}) | ||
| +if(FALSE) | ||
| add_executable( | ||
| zmakecert | ||
| "${SOURCE_DIR}/src/zmakecert.c" | ||
| @@ -631,6 +637,7 @@ | ||
| ${OPTIONAL_LIBRARIES_STATIC} | ||
| ) | ||
| endif() | ||
| +endif() | ||
|
|
||
| install(TARGETS czmq | ||
| ######################################################################## | ||
| # tests |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,25 @@ | ||
| --- 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) | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -2,9 +2,9 @@ | ||
| 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) | ||
| if(${CMAKE_SYSTEM_NAME} STREQUAL Darwin) | ||
| - cmake_minimum_required(VERSION 3.0.2) | ||
| + cmake_minimum_required(VERSION 3.15) | ||
| else() | ||
| - cmake_minimum_required(VERSION 2.8.12) | ||
| + cmake_minimum_required(VERSION 2.15) | ||
| endif() | ||
|
|
||
| set(perf-tools local_lat | ||
| include(CheckIncludeFiles) | ||
| @@ -1469,6 +1469,10 @@ | ||
| if(BUILD_SHARED) | ||
| target_link_libraries(libzmq ${CMAKE_THREAD_LIBS_INIT}) | ||
|
|
||
| + if(HAVE_CLOCK_GETTIME) | ||
| + target_link_libraries(libzmq -lrt) | ||
| + endif() | ||
| + | ||
| if(QNX) | ||
| target_link_libraries(libzmq -lsocket) | ||
| endif() |
Oops, something went wrong.