iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into sasl

Browse Source
This commit is contained in:
Alexey Sokolov
2025-02-25 18:44:52 +00:00
parent 843b40becc a85533b15a
commit db5eeb1626
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
CMakeLists.txt
View File

@@ -55,6 +55,7 @@ include(use_homebrew)
include(GNUInstallDirs)
include(CheckCXXSymbolExists)
include(copy_csocket)
include(CMakePushCheckState)
set(CMAKE_THREAD_PREFER_PTHREAD true)
set(THREADS_PREFER_PTHREAD_FLAG true)
@@ -89,13 +90,12 @@ if(WANT_OPENSSL)
# LibreSSL gained that function later too.
# TODO: maybe remove this check at some point, and stop supporting old
# libssl versions
function(check_SSL_SESSION_get0_cipher)
cmake_push_check_state(RESET)
set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES})
set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR})
check_cxx_symbol_exists(SSL_SESSION_get0_cipher openssl/ssl.h
HAVE_SSL_SESSION_get0_cipher)
endfunction()
check_SSL_SESSION_get0_cipher()
cmake_pop_check_state()
set(ZNC_CMAKE_FIND_DEPS
"${ZNC_CMAKE_FIND_DEPS}\nfind_dependency(OpenSSL)")
list(APPEND zncpubdeps OpenSSL::SSL)
@@ -120,15 +120,15 @@ if(WANT_CYRUS)
# next ubuntu version has 2.1.26 which has libsasl2.pc
#
# osx (as of El Capitan) doesn't have it either...
set(_old_cmake_required_libraries "${CMAKE_REQUIRED_LIBRARIES}")
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} -lsasl2)
# sys/types.h here is workaround for sasl 2.1.26:
# https://github.com/znc/znc/issues/1243
# https://lists.andrew.cmu.edu/pipermail/cyrus-sasl/2012-December/002572.html
# https://cgit.cyrus.foundation/cyrus-sasl/commit/include/sasl.h?id=2f740223fa1820dd71e6ab0e50d4964760789209
check_cxx_symbol_exists(sasl_server_init "sys/types.h;sasl/sasl.h"
CYRUS_HARDCODED)
set(CMAKE_REQUIRED_LIBRARIES "${_old_cmake_required_libraries}")
cmake_push_check_state(RESET)
set(CMAKE_REQUIRED_LIBRARIES -lsasl2)
# sys/types.h here is workaround for sasl 2.1.26:
# https://github.com/znc/znc/issues/1243
# https://lists.andrew.cmu.edu/pipermail/cyrus-sasl/2012-December/002572.html
# https://cgit.cyrus.foundation/cyrus-sasl/commit/include/sasl.h?id=2f740223fa1820dd71e6ab0e50d4964760789209
check_cxx_symbol_exists(sasl_server_init "sys/types.h;sasl/sasl.h"
CYRUS_HARDCODED)
cmake_pop_check_state()
if(CYRUS_HARDCODED)
add_library(HardcodedCyrusDep INTERFACE)
add_library(PkgConfig::CYRUS ALIAS HardcodedCyrusDep)