Unverified Commit e0d9e213 authored by Luca Boccassi's avatar Luca Boccassi Committed by GitHub

Merge pull request #3738 from eldruin/external-output-name

Allow library output name to be changed externally
parents 97df2dac 0605d06f
......@@ -44,6 +44,8 @@ if (ENABLE_INTRINSICS)
add_definitions(-DZMQ_HAVE_ATOMIC_INTRINSICS)
endif()
set (ZMQ_OUTPUT_BASENAME "zmq" CACHE STRING "Output zmq library base name")
if(${CMAKE_SYSTEM_NAME} STREQUAL Darwin)
# Find more information: https://cmake.org/Wiki/CMake_RPATH_handling
......@@ -1161,7 +1163,7 @@ if(MSVC)
# of file content.
set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /ignore:4221")
set(PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin")
set(PDB_NAME "libzmq${MSVC_TOOLSET}-mt-gd-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}")
set(PDB_NAME "lib${ZMQ_OUTPUT_BASENAME}${MSVC_TOOLSET}-mt-gd-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}")
function(enable_vs_guideline_checker target)
set_target_properties(${target} PROPERTIES
VS_GLOBAL_EnableCppCoreCheck true
......@@ -1181,7 +1183,7 @@ if(MSVC)
DEBUG_POSTFIX "${MSVC_TOOLSET}-mt-gd-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
COMPILE_DEFINITIONS "DLL_EXPORT"
OUTPUT_NAME "libzmq")
OUTPUT_NAME "lib${ZMQ_OUTPUT_BASENAME}")
endif()
if(BUILD_STATIC)
......@@ -1193,7 +1195,7 @@ if(MSVC)
MINSIZEREL_POSTFIX "${MSVC_TOOLSET}-mt-s-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
DEBUG_POSTFIX "${MSVC_TOOLSET}-mt-sgd-${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH}"
COMPILE_FLAGS "/DZMQ_STATIC"
OUTPUT_NAME "libzmq")
OUTPUT_NAME "lib{ZMQ_OUTPUT_BASENAME}")
endif()
else()
# avoid building everything twice for shared + static
......@@ -1220,7 +1222,7 @@ else()
PUBLIC_HEADER "${public_headers}"
VERSION "5.2.3"
SOVERSION "5"
OUTPUT_NAME "zmq"
OUTPUT_NAME "${ZMQ_OUTPUT_BASENAME}"
PREFIX "lib")
if(ZMQ_BUILD_FRAMEWORK)
set_target_properties(libzmq PROPERTIES
......@@ -1250,7 +1252,7 @@ else()
endif()
set_target_properties(libzmq-static PROPERTIES
PUBLIC_HEADER "${public_headers}"
OUTPUT_NAME "zmq"
OUTPUT_NAME "${ZMQ_OUTPUT_BASENAME}"
PREFIX "lib")
endif()
endif()
......
# Permission to Relicense under MPLv2 or any other OSI approved license chosen by the current ZeroMQ BDFL
This is a statement by Diego Barrios Romero
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 "eldruin", with
commit author "Diego Barrios Romero <eldruin@gmail.com>", are copyright of Diego Barrios Romero.
This document hereby grants the libzmq project team to relicense libzmq,
including all past, present and future contributions of the author listed above.
Diego Barrios Romero
2019/11/13
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment