From 84a6f10d459b3e2294158836965db397054452d6 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Fri, 5 Jun 2026 13:09:28 +0000 Subject: [PATCH] Link TinyLDAP crypto through nwssl --- CMakeLists.txt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index adc96c1..0349b4f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,8 @@ set(TINYLDAP_TOOL_PREFIX "" CACHE STRING "Optional prefix for non-server tool ex set(TINYLDAP_INCLUDE_SUBDIR "" CACHE STRING "Public include subdirectory below CMAKE_INSTALL_INCLUDEDIR. Defaults to TINYLDAP_OUTPUT_NAME") set(TINYLDAP_LIBOWFAT_INCLUDE_SUBDIR "" CACHE STRING "libowfat public include subdirectory. Defaults to LIBOWFAT_INSTALL_INCLUDE_SUBDIR if present, otherwise libowfat") set(TINYLDAP_LIBOWFAT_BUILD_DIR "" CACHE PATH "Optional libowfat CMake build directory to consume directly without installation") -set(TINYLDAP_MATRIXSSL_BUILD_DIR "" CACHE PATH "Optional MatrixSSL CMake build directory to use for OpenSSL::Crypto compatibility") +set(TINYLDAP_NWSSL_TARGET "" CACHE STRING "Optional nwssl target that provides OpenSSL-compatible Crypto headers and symbols") +set(TINYLDAP_MATRIXSSL_BUILD_DIR "" CACHE PATH "Optional legacy MatrixSSL CMake build directory to use for OpenSSL::Crypto compatibility") set(TINYLDAP_MATRIXSSL_INCLUDE_SUBDIR "" CACHE STRING "MatrixSSL public include subdirectory inside TINYLDAP_MATRIXSSL_BUILD_DIR/include. Auto-detected when empty") if(NOT TINYLDAP_BUILD_STATIC AND NOT TINYLDAP_BUILD_SHARED) @@ -207,7 +208,14 @@ static inline int MD5_Final(unsigned char *md, MD5_CTX *c) { psMd5Final(c, md); ") endfunction() -if(TARGET OpenSSL::Crypto) +if(NOT TINYLDAP_NWSSL_TARGET STREQUAL "") + if(NOT TARGET ${TINYLDAP_NWSSL_TARGET}) + message(FATAL_ERROR "TINYLDAP_NWSSL_TARGET=${TINYLDAP_NWSSL_TARGET} is not a CMake target") + endif() + set(TINYLDAP_CRYPTO_TARGET ${TINYLDAP_NWSSL_TARGET}) +elseif(TARGET mars_nwe::ssl) + set(TINYLDAP_CRYPTO_TARGET mars_nwe::ssl) +elseif(TARGET OpenSSL::Crypto) if(TARGET MATRIXSSL::matrixssl OR TARGET matrixssl OR TARGET matrixssl_static) tinyldap_write_matrixssl_md5_compat() endif()