| diff --git a/CMakeLists.txt b/CMakeLists.txt |
| index 0ce3649..3981b6b 100644 |
| --- a/CMakeLists.txt |
| +++ b/CMakeLists.txt |
| @@ -23,7 +23,7 @@ MESSAGE(STATUS "CMake version: " ${CMAKE_VERSION}) |
| MESSAGE(STATUS "CMake system name: " ${CMAKE_SYSTEM_NAME}) |
| |
| SET(CMAKE_SCRIPTS "${CMAKE_SOURCE_DIR}/cmake") |
| -SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") |
| +list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") |
| |
| ## build settings |
| SET(PAHO_VERSION_MAJOR 1) |
| diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
| index c57185b..3d0c2c7 100644 |
| --- a/src/CMakeLists.txt |
| +++ b/src/CMakeLists.txt |
| @@ -101,27 +101,12 @@ INSTALL(FILES MQTTAsync.h MQTTClient.h MQTTClientPersistence.h |
| DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) |
| |
| IF (PAHO_WITH_SSL) |
| - SET(OPENSSL_SEARCH_PATH "" CACHE PATH "Directory containing OpenSSL libraries and includes") |
| + FIND_PACKAGE(OpenSSL REQUIRED) |
| |
| - IF (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") |
| - SET(OPENSSL_SEARCH_PATH "/usr/local/opt/openssl") |
| - ENDIF (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") |
| - |
| - IF (WIN32) |
| - SET(OPENSSL_SEARCH_PATH "C:/OpenSSL-Win64") |
| - ENDIF () |
| - |
| - FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h |
| - HINTS ${OPENSSL_SEARCH_PATH}/include) |
| - FIND_LIBRARY(OPENSSL_LIB NAMES ssl libssl ssleay32 |
| - HINTS ${OPENSSL_SEARCH_PATH}/lib ${OPENSSL_SEARCH_PATH}/lib64) |
| - FIND_LIBRARY(OPENSSLCRYPTO_LIB NAMES crypto libcrypto libeay32 |
| - HINTS ${OPENSSL_SEARCH_PATH}/lib ${OPENSSL_SEARCH_PATH}/lib64) |
| - |
| - MESSAGE(STATUS "OpenSSL hints: ${OPENSSL_SEARCH_PATH}") |
| MESSAGE(STATUS "OpenSSL headers found at ${OPENSSL_INCLUDE_DIR}") |
| - MESSAGE(STATUS "OpenSSL library found at ${OPENSSL_LIB}") |
| - MESSAGE(STATUS "OpenSSL Crypto library found at ${OPENSSLCRYPTO_LIB}") |
| + MESSAGE(STATUS "OpenSSL libraries found at ${OPENSSL_LIBRARIES}") |
| + MESSAGE(STATUS "OpenSSL SSL library found at ${OPENSSL_SSL_LIBRARY}") |
| + MESSAGE(STATUS "OpenSSL Crypto library found at ${OPENSSL_CRYPTO_LIBRARY}") |
| |
| INCLUDE_DIRECTORIES( |
| ${OPENSSL_INCLUDE_DIR} |
| @@ -135,8 +120,8 @@ IF (PAHO_WITH_SSL) |
| ADD_LIBRARY(paho-mqtt3cs SHARED $<TARGET_OBJECTS:common_ssl_obj> MQTTClient.c SSLSocket.c) |
| ADD_LIBRARY(paho-mqtt3as SHARED $<TARGET_OBJECTS:common_ssl_obj> MQTTAsync.c SSLSocket.c) |
| |
| - TARGET_LINK_LIBRARIES(paho-mqtt3cs ${OPENSSL_LIB} ${OPENSSLCRYPTO_LIB} ${LIBS_SYSTEM}) |
| - TARGET_LINK_LIBRARIES(paho-mqtt3as ${OPENSSL_LIB} ${OPENSSLCRYPTO_LIB} ${LIBS_SYSTEM}) |
| + TARGET_LINK_LIBRARIES(paho-mqtt3cs ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} ${LIBS_SYSTEM}) |
| + TARGET_LINK_LIBRARIES(paho-mqtt3as ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY} ${LIBS_SYSTEM}) |
| SET_TARGET_PROPERTIES( |
| paho-mqtt3cs paho-mqtt3as PROPERTIES |
| VERSION ${CLIENT_VERSION} |