From 31569c78d94b3cd2faf76f357104d4b557ce6ed8 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Mon, 16 Mar 2020 19:32:56 -0400 Subject: [PATCH 1/2] Problem: CMake config doesn't support multiarch Solution: Install CMake config in arch-dependent LIBDIR/cmake Using "share/cmake/${PROJECT_NAME}" as DESTINATION for installing ZeroMQConfig.cmake et al works for arch-independent configs, but is wrong for multiarch. The configs for each version of the library should be stored below the arch-dependent LIBDIR, using the GNUInstallDirs ${CMAKE_INSTALL_LIBDIR} variable. Signed-off-by: FeRD (Frank Dana) --- CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b3b509c..8e79a01d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1513,8 +1513,9 @@ endif() if(WIN32) set(ZEROMQ_CMAKECONFIG_INSTALL_DIR "CMake" CACHE STRING "install path for ZeroMQConfig.cmake") else() - # GNUInstallDirs "DATADIR" wrong here; CMake search path wants "share". - set(ZEROMQ_CMAKECONFIG_INSTALL_DIR "share/cmake/${PROJECT_NAME}" CACHE STRING "install path for ZeroMQConfig.cmake") + # CMake search path wants either "share" (AKA GNUInstallDirs DATAROOTDIR) + # for arch-independent, or LIBDIR for arch-dependent, plus "cmake" as prefix + set(ZEROMQ_CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}" CACHE STRING "install path for ZeroMQConfig.cmake") endif() if((NOT CMAKE_VERSION VERSION_LESS 3.0) AND (BUILD_SHARED OR BUILD_STATIC)) From a97158aa2a9112433e7543fb731658b84337fb05 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Mon, 16 Mar 2020 19:51:39 -0400 Subject: [PATCH 2/2] Add relicensing statement for ferdnyc Signed-off-by: FeRD (Frank Dana) --- RELICENSE/ferdnyc.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 RELICENSE/ferdnyc.md diff --git a/RELICENSE/ferdnyc.md b/RELICENSE/ferdnyc.md new file mode 100644 index 00000000..283030a5 --- /dev/null +++ b/RELICENSE/ferdnyc.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 Frank R. Dana Jr. +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 "ferdnyc", with +commit author "FeRD (Frank Dana)", are copyright of Frank R. Dana, Jr. +This document hereby grants the libzmq project team to relicense libzmq, +including all past, present and future contributions of the author listed above. + +Frank Richard Dana, Jr. +2020-03-16