generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-01 10:57:59 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4323 from boscosiu/cmake-export-use-draft-api

Browse Source 
Problem: ZMQ_BUILD_DRAFT_API define is not propagated to dependent CMake projects
This commit is contained in:
Luca Boccassi 2021-12-29 12:46:47 +00:00 committed by GitHub
commit ee09926cbd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -160,7 +160,6 @@ endif()
# Enable WebSocket transport and RadixTree # Enable WebSocket transport and RadixTree
if(ENABLE_DRAFTS) if(ENABLE_DRAFTS)
message(STATUS "Building draft classes and methods") message(STATUS "Building draft classes and methods")
set(ZMQ_BUILD_DRAFT_API 1)
option(ENABLE_WS "Enable WebSocket transport" ON) option(ENABLE_WS "Enable WebSocket transport" ON)
option(ENABLE_RADIX_TREE "Use radix tree implementation to manage subscriptions" ON) option(ENABLE_RADIX_TREE "Use radix tree implementation to manage subscriptions" ON)
else() else()
@ -1379,9 +1378,6 @@ else()
if(NOT MINGW) if(NOT MINGW)
add_library(objects OBJECT ${sources}) add_library(objects OBJECT ${sources})
set_property(TARGET objects PROPERTY POSITION_INDEPENDENT_CODE ON) set_property(TARGET objects PROPERTY POSITION_INDEPENDENT_CODE ON)
target_include_directories(
objects PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> $<INSTALL_INTERFACE:include>)
endif() endif()
if(BUILD_SHARED) if(BUILD_SHARED)
@ -1450,10 +1446,19 @@ if(BUILD_STATIC)
list(APPEND target_outputs "libzmq-static") list(APPEND target_outputs "libzmq-static")
endif() endif()
foreach(target ${target_outputs}) set(build_targets ${target_outputs})
if(TARGET objects)
list(APPEND build_targets "objects")
endif()
foreach(target ${build_targets})
target_include_directories( target_include_directories(
${target} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> ${target} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> $<INSTALL_INTERFACE:include>) $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> $<INSTALL_INTERFACE:include>)
if(ENABLE_DRAFTS)
target_compile_definitions(${target} PUBLIC ZMQ_BUILD_DRAFT_API)
endif()
endforeach() endforeach()
if(BUILD_SHARED) if(BUILD_SHARED)

15
RELICENSE/boscosiu.md Normal file
View File

@ -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 boscosiu
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 "boscosiu", with
commit author "boscosiu", are copyright of boscosiu.
This document hereby grants the libzmq project team to relicense libzmq,
including all past, present and future contributions of the author listed above.
boscosiu
2021/12/28

1
builds/cmake/platform.hpp.in
View File

@ -71,7 +71,6 @@
#cmakedefine ZMQ_HAVE_NORM #cmakedefine ZMQ_HAVE_NORM
#cmakedefine ZMQ_MAKE_VALGRIND_HAPPY #cmakedefine ZMQ_MAKE_VALGRIND_HAPPY
#cmakedefine ZMQ_BUILD_DRAFT_API
#cmakedefine ZMQ_HAVE_CURVE #cmakedefine ZMQ_HAVE_CURVE
#cmakedefine ZMQ_USE_TWEETNACL #cmakedefine ZMQ_USE_TWEETNACL
#cmakedefine ZMQ_USE_LIBSODIUM #cmakedefine ZMQ_USE_LIBSODIUM