Mirrors_Framework/mosquitto
1
0
Fork 0
mirror of https://github.com/eclipse-mosquitto/mosquitto.git synced 2026-09-21 23:47:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use OpenSSL:SSL cmake target

Browse Source 
Instead of using the CMAKE_OPENSSL_INCLUDE and CMAKE_OPENSSL_LIBRARY
variables the imported target OpenSSL::SSL is used.
This is a more modern way of target linking.

Signed-off-by: Kai Buschulte <kai.buschulte@cedalo.com>
This commit is contained in:
Kai Buschulte
2022-06-22 23:56:09 +01:00
committed by Roger A. Light
parent 71e1b92564
commit 36935a3384
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/mosquitto_ctrl/CMakeLists.txt
+1 -2
View File
@@ -17,7 +17,6 @@ if(WITH_TLS AND CJSON_FOUND)
)
target_include_directories(mosquitto_ctrl PRIVATE
"${OPENSSL_INCLUDE_DIR}"
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
"${mosquitto_SOURCE_DIR}"
@@ -57,7 +56,7 @@ if(WITH_TLS AND CJSON_FOUND)
target_link_libraries(mosquitto_ctrl
PRIVATE
${OPENSSL_LIBRARIES}
OpenSSL::SSL
cJSON
)
apps/mosquitto_passwd/CMakeLists.txt
+1 -2
View File
@@ -10,7 +10,6 @@ if(WITH_TLS)
)
target_include_directories(mosquitto_passwd PRIVATE
"${OPENSSL_INCLUDE_DIR}"
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
"${mosquitto_SOURCE_DIR}"
@@ -22,7 +21,7 @@ if(WITH_TLS)
target_link_libraries(mosquitto_passwd
PRIVATE
${OPENSSL_LIBRARIES}
OpenSSL::SSL
)
install(TARGETS mosquitto_passwd
lib/CMakeLists.txt
+3 -3
View File
@@ -58,7 +58,9 @@ if (WITH_THREADING AND WIN32)
list(APPEND C_SRC "../common/winthread_mosq.c" "../common/winthread_mosq.h")
endif()
set (LIBRARIES ${OPENSSL_LIBRARIES})
if(WITH_TLS)
set (LIBRARIES OpenSSL::SSL)
endif()
if(UNIX AND NOT APPLE AND NOT ANDROID)
find_library(LIBRT rt)
@@ -104,7 +106,6 @@ endif()
target_include_directories(libmosquitto
PUBLIC
"${mosquitto_SOURCE_DIR}/include"
"${OPENSSL_INCLUDE_DIR}"
PRIVATE
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
@@ -152,7 +153,6 @@ if(WITH_STATIC_LIBRARIES)
target_link_libraries(libmosquitto_static PRIVATE ${LIBRARIES})
target_include_directories(libmosquitto_static PRIVATE
"${OPENSSL_INCLUDE_DIR}"
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
"${mosquitto_SOURCE_DIR}"
src/CMakeLists.txt
+3 -3
View File
@@ -148,7 +148,9 @@ endif()
add_definitions (-DWITH_BROKER)
set (MOSQ_LIBS ${MOSQ_LIBS} ${OPENSSL_LIBRARIES})
if(WITH_TLS)
set (MOSQ_LIBS ${MOSQ_LIBS} OpenSSL::SSL)
endif()
# Check for getaddrinfo_a
include(CheckLibraryExists)
check_library_exists(anl getaddrinfo_a "" HAVE_GETADDRINFO_A)
@@ -225,11 +227,9 @@ endif()
target_include_directories(mosquitto
PUBLIC
"${mosquitto_SOURCE_DIR}/include"
"${OPENSSL_INCLUDE_DIR}"
PRIVATE
"${STDBOOL_H_PATH}"
"${STDINT_H_PATH}"
"${mosquitto_SOURCE_DIR}"
"${mosquitto_SOURCE_DIR}/common"
"${mosquitto_SOURCE_DIR}/lib"
"${mosquitto_SOURCE_DIR}/src"