eclipse/mosquitto
1
0
Fork 0
mirror of https://github.com/eclipse/mosquitto.git synced 2025-10-14 02:48:40 +08:00
Code Issues Releases Wiki Activity

Fix CMake builds with WITH_TLS=OFF

Browse Source 
Recent CMake changes caused CMake builds with the WITH_TLS option set to OFF to fail. The OpenSSL package is only found (find_package()) if WITH_TLS is ON, but linking to OpenSSL for the broker and library is not guarded by WITH_TLS. The build therefore fails.

Guard linking to OpenSSL, only linking if WITH_TLS is set.
This commit is contained in:
Ben Marsh
2025-07-21 17:46:16 +01:00
committed by Roger Light
parent ff1187fd9c
commit af68d99c98
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/CMakeLists.txt
View File

@@ -60,7 +60,9 @@ set(C_SRC
util_mosq.c util_topic.c util_mosq.h util_mosq.c util_topic.c util_mosq.h
will_mosq.c will_mosq.h) will_mosq.c will_mosq.h)
set (LIBRARIES OpenSSL::SSL) if (WITH_TLS)
set (LIBRARIES OpenSSL::SSL)
endif()
if (UNIX AND NOT APPLE AND NOT ANDROID) if (UNIX AND NOT APPLE AND NOT ANDROID)
find_library(LIBRT rt) find_library(LIBRT rt)

5
src/CMakeLists.txt
View File

@@ -163,7 +163,10 @@ if (WITH_DLT)
set (MOSQ_LIBS ${MOSQ_LIBS} ${DLT_LIBRARIES}) set (MOSQ_LIBS ${MOSQ_LIBS} ${DLT_LIBRARIES})
endif (WITH_DLT) endif (WITH_DLT)
set (MOSQ_LIBS ${MOSQ_LIBS} OpenSSL::SSL) if (WITH_TLS)
set (MOSQ_LIBS ${MOSQ_LIBS} OpenSSL::SSL)
endif()
# Check for getaddrinfo_a # Check for getaddrinfo_a
include(CheckLibraryExists) include(CheckLibraryExists)
check_library_exists(anl getaddrinfo_a "" HAVE_GETADDRINFO_A) check_library_exists(anl getaddrinfo_a "" HAVE_GETADDRINFO_A)