From ff2987d24a4a889fa1fdc75b973fbcadbbf64c29 Mon Sep 17 00:00:00 2001 From: Darkdragon-001 Date: Tue, 15 Mar 2022 12:12:21 +0100 Subject: [PATCH 1/2] Fix pkgconfig Use CMake install variables instead of hardcoded values. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ef6662da..a2347e8e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1227,8 +1227,8 @@ list(APPEND sources ${CMAKE_CURRENT_BINARY_DIR}/platform.hpp) set(prefix ${CMAKE_INSTALL_PREFIX}) set(exec_prefix ${prefix}) -set(libdir ${prefix}/lib) -set(includedir ${prefix}/include) +set(libdir ${prefix}/${CMAKE_INSTALL_LIBDIR}) +set(includedir ${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) set(VERSION ${ZMQ_VERSION_MAJOR}.${ZMQ_VERSION_MINOR}.${ZMQ_VERSION_PATCH}) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/libzmq.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libzmq.pc @ONLY) set(zmq-pkgconfig ${CMAKE_CURRENT_BINARY_DIR}/libzmq.pc) From 58c2ac15b4a1995c97c6a6fcc2a6a5f09609ed7e Mon Sep 17 00:00:00 2001 From: Darkdragon-001 Date: Tue, 15 Mar 2022 12:44:01 +0100 Subject: [PATCH 2/2] Add RELICENSE. --- RELICENSE/darkdragon-001.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 RELICENSE/darkdragon-001.md diff --git a/RELICENSE/darkdragon-001.md b/RELICENSE/darkdragon-001.md new file mode 100644 index 00000000..c4b4d7b1 --- /dev/null +++ b/RELICENSE/darkdragon-001.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 Darkdragon-001 +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 "darkdragon-001", with +commit author "Darkdragon-001", are copyright of Darkdragon-001. +This document hereby grants the libzmq project team to relicense libzmq, +including all past, present and future contributions of the author listed above. + +Darkdragon-001 +2022/03/15