From c9813364455c647ebdb5f62a5b87481307c2d164 Mon Sep 17 00:00:00 2001 From: Wenbin Hou Date: Wed, 15 Aug 2018 10:11:49 +0800 Subject: [PATCH 1/3] Udpate unittests/CMakeLists.txt: use ZeroMQ_SOURCE_DIR, ZeroMQ_BINARY_DIR Use ZeroMQ_SOURCE_DIR, ZeroMQ_BINARY_DIR instead of CMAKE_SOURCE_DIR, CMAKE_BINARY_DIR, which allows libzmq to become an "add_subdirectory" target (with static build). Otherwise, building unittest_xxx would complain header files not found. --- unittests/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt index a9a02c2e..29cde824 100644 --- a/unittests/CMakeLists.txt +++ b/unittests/CMakeLists.txt @@ -22,8 +22,8 @@ if(WIN32) link_libraries(ws2_32.lib) endif() -include_directories("${CMAKE_SOURCE_DIR}/include" "${CMAKE_SOURCE_DIR}/src" "${CMAKE_BINARY_DIR}") -include_directories("${CMAKE_SOURCE_DIR}/external/unity") +include_directories("${ZeroMQ_SOURCE_DIR}/include" "${ZeroMQ_SOURCE_DIR}/src" "${ZeroMQ_BINARY_DIR}") +include_directories("${ZeroMQ_SOURCE_DIR}/external/unity") foreach(test ${unittests}) # target_sources not supported before CMake 3.1 @@ -31,7 +31,7 @@ foreach(test ${unittests}) # per-test directories not generated on OS X / Darwin if (NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang.*") - link_directories(${test} PRIVATE "${CMAKE_SOURCE_DIR}/../lib") + link_directories(${test} PRIVATE "${ZeroMQ_SOURCE_DIR}/../lib") endif() target_link_libraries(${test} libzmq-static ${OPTIONAL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} unity) From 8fbb32c8f1f2ab2df9c920fce59c1d246a6abe8b Mon Sep 17 00:00:00 2001 From: Wenbin Hou Date: Thu, 16 Aug 2018 08:46:48 +0800 Subject: [PATCH 2/3] RELICENSE: Wenbin Hou Create RELICENSE/WenbinHou.md --- RELICENSE/WenbinHou.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 RELICENSE/WenbinHou.md diff --git a/RELICENSE/WenbinHou.md b/RELICENSE/WenbinHou.md new file mode 100644 index 00000000..28eda9ad --- /dev/null +++ b/RELICENSE/WenbinHou.md @@ -0,0 +1,15 @@ +# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL + +This is a statement by Wenbin Hou +that grants permission to relicense its copyrights in the libzmq C++ +library (ZeroMQ) under the Mozilla Public License v2 (MPLv2) or any other +Open Source Initiative approved license chosen by the current ZeroMQ +BDFL (Benevolent Dictator for Life). + +A portion of the commits made by the Github handle "Wenbin Hou", with +commit author "Wenbin Hou ", are copyright of Wenbin Hou. +This document hereby grants the libzmq project team to relicense libzmq, +including all past, present and future contributions of the author listed above. + +Wenbin Hou +2018/05/16 From 0507ae877d2d40985c036a649dd0a84c9b1e8ee5 Mon Sep 17 00:00:00 2001 From: Wenbin Hou Date: Thu, 16 Aug 2018 13:17:44 +0800 Subject: [PATCH 3/3] Update tests/CMakeLists.txt: use ZeroMQ_SOURCE_DIR, ZeroMQ_BINARY_DIR Use ZeroMQ_SOURCE_DIR, ZeroMQ_BINARY_DIR instead of CMAKE_SOURCE_DIR, CMAKE_BINARY_DIR in tests/CMakeLists.txt Similar reason to change unittests/CMakeLists.txt --- tests/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 591da07f..abc94a33 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -171,7 +171,7 @@ link_libraries(libzmq ${OPTIONAL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} unity) else () link_libraries(libzmq-static ${OPTIONAL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} unity) endif () -include_directories("${CMAKE_SOURCE_DIR}/../include" "${CMAKE_BINARY_DIR}") +include_directories("${ZeroMQ_SOURCE_DIR}/../include" "${ZeroMQ_BINARY_DIR}") foreach(test ${tests}) # target_sources not supported before CMake 3.1 @@ -198,7 +198,7 @@ foreach(test ${tests}) else() # per-test directories not generated on OS X / Darwin if (NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "Clang.*") - link_directories(${test} PRIVATE "${CMAKE_SOURCE_DIR}/../lib") + link_directories(${test} PRIVATE "${ZeroMQ_SOURCE_DIR}/../lib") endif() endif()