From 041c33ec4fd9f3efa957b57c9c321146065f5626 Mon Sep 17 00:00:00 2001 From: Vitaly Ogoltsov Date: Thu, 13 Jun 2019 15:18:34 +0300 Subject: [PATCH] Added OpenSSL as link interfacy library to PahoMqttC and moved OPENSSL definition to PahoMqttC library interface definitions. PAHO_BUILD_SSL does only really affect the paho.mqtt.c library, not the paho.mqtt.cpp. Signed-off-by: Vitaly Ogoltsov --- cmake/FindPahoMqttC.cmake | 6 +++++- src/CMakeLists.txt | 4 ---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/FindPahoMqttC.cmake b/cmake/FindPahoMqttC.cmake index 10c2bfa..0ec95bd 100644 --- a/cmake/FindPahoMqttC.cmake +++ b/cmake/FindPahoMqttC.cmake @@ -15,8 +15,12 @@ add_library(PahoMqttC::PahoMqttC UNKNOWN IMPORTED) set_target_properties(PahoMqttC::PahoMqttC PROPERTIES IMPORTED_LOCATION "${PAHO_MQTT_C_LIBRARIES}" INTERFACE_INCLUDE_DIRECTORIES "${PAHO_MQTT_C_INCLUDE_DIRS}" - INTERFACE_LINK_LIBRARIES "${PAHO_MQTT_C_LIBRARIES}" IMPORTED_LINK_INTERFACE_LANGUAGES "C") +if(PAHO_WITH_SSL) + set_target_properties(PahoMqttC::PahoMqttC PROPERTIES + INTERFACE_COMPILE_DEFINITIONS "OPENSSL=1" + INTERFACE_LINK_LIBRARIES "OpenSSL::SSL;OpenSSL::Crypto") +endif() include(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(PahoMqttC diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bfcf6bb..e528fbf 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -61,10 +61,6 @@ add_library(paho-cpp-objs OBJECT # OBJECTS DESTINATION ${CMAKE_INSTALL_LIBDIR} #) -if(PAHO_WITH_SSL) - add_definitions(-DOPENSSL) -endif() - # Object libraries can't use target_link_libraries in order to take advantage # of transitive usage requirements until CMake 3.12. This is a workaround: #target_include_directories(OBJS PRIVATE ${PAHO_MQTT_C_INCLUDE_DIRS})