generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-12 10:33:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4533 from autoantwort/gnutls-include-dir

Browse Source 
Don't assume that GnuTLS is on the search path
This commit is contained in:
Luca Boccassi 2023-03-27 22:34:39 +01:00 committed by GitHub
commit 1b52e19b2b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -1380,6 +1380,9 @@ 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)
if(GNUTLS_FOUND)
target_include_directories(objects PRIVATE "${GNUTLS_INCLUDE_DIR}")
endif()
endif() endif()
if(BUILD_SHARED) if(BUILD_SHARED)
@ -1467,6 +1470,7 @@ if(BUILD_SHARED)
target_link_libraries(libzmq ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(libzmq ${CMAKE_THREAD_LIBS_INIT})
if(GNUTLS_FOUND) if(GNUTLS_FOUND)
target_link_libraries(libzmq ${GNUTLS_LIBRARIES}) target_link_libraries(libzmq ${GNUTLS_LIBRARIES})
target_include_directories(libzmq PRIVATE "${GNUTLS_INCLUDE_DIR}")
endif() endif()
if(NSS3_FOUND) if(NSS3_FOUND)
@ -1512,6 +1516,7 @@ if(BUILD_STATIC)
target_link_libraries(libzmq-static ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(libzmq-static ${CMAKE_THREAD_LIBS_INIT})
if(GNUTLS_FOUND) if(GNUTLS_FOUND)
target_link_libraries(libzmq-static ${GNUTLS_LIBRARIES}) target_link_libraries(libzmq-static ${GNUTLS_LIBRARIES})
target_include_directories(libzmq-static PRIVATE "${GNUTLS_INCLUDE_DIR}")
endif() endif()
if(LIBBSD_FOUND) if(LIBBSD_FOUND)
@ -1580,6 +1585,7 @@ if(BUILD_SHARED)
if(GNUTLS_FOUND) if(GNUTLS_FOUND)
target_link_libraries(${perf-tool} ${GNUTLS_LIBRARIES}) target_link_libraries(${perf-tool} ${GNUTLS_LIBRARIES})
target_include_directories(${perf-tool} PRIVATE "${GNUTLS_INCLUDE_DIR}")
endif() endif()
if(LIBBSD_FOUND) if(LIBBSD_FOUND)

15
RELICENSE/autoantwort.txt 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 Leander Schulten
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 "autoantwort", with
commit author "Leander Schulten <Leander.Schulten@rwth-aachen.de>", are copyright of Leander Schulten .
This document hereby grants the libzmq project team to relicense libzmq,
including all past, present and future contributions of the author listed above.
Leander Schulten
2023/03/27