natas_hw
/
paho
mirror of https://github.com/eclipse/paho.mqtt.c
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'fix-ssl-dir' of github.com:fpagliughi/paho.mqtt.c into fpagliughi-fix-ssl-dir" 

This reverts commit 96ec1e9765, reversing
changes made to 141b03f978.
This commit is contained in:
Ian Craggs 2024-12-26 19:41:41 +00:00
parent aea6def205
commit f4d5bd63fc
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -25,8 +25,8 @@ project("Eclipse Paho C"
message(STATUS "CMake version: " ${CMAKE_VERSION})
message(STATUS "CMake system name: " ${CMAKE_SYSTEM_NAME})
set(CMAKE_SCRIPTS "${PROJECT_SOURCE_DIR}/cmake")
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules")
set(CMAKE_SCRIPTS "${CMAKE_SOURCE_DIR}/cmake")
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
## Project Version
## Previously we read in the version from these files, but now we use the

15
src/CMakeLists.txt
View File

@ -230,15 +230,20 @@ install(
if(PAHO_WITH_SSL OR PAHO_WITH_LIBRESSL)
if(PAHO_WITH_LIBRESSL)
set(LIBRESSL_ROOT_DIR "" CACHE PATH "Directory containing LibreSSL libraries and includes")
find_package(LibreSSL REQUIRED)
set(SSL_LIBRARY_NAME LibreSSL)
message(STATUS "Using LibreSSL with headers at ${LIBRESSL_INCLUDE_DIR}, lib ${LIBRESSL_SSL_LIBRARY}")
set(SSL_INCLUDE_DIR ${LIBRESSL_INCLUDE_DIR} CACHE PATH "Directory containing SSL includes")
set(SSL_LIBRARY_NAME LibreSSL CACHE STRING "Name of the used SSL library")
set(SSL_ROOT_DIR ${LIBRESSL_ROOT_DIR} CACHE PATH "Directory containing SSL libraries and includes")
else()
set(OPENSSL_ROOT_DIR "" CACHE PATH "Directory containing OpenSSL libraries and includes")
find_package(OpenSSL REQUIRED)
set(SSL_LIBRARY_NAME OpenSSL)
message(STATUS "Using OpenSSL with headers at ${OPENSSL_INCLUDE_DIR}, lib ${OPENSSL_SSL_LIBRARY}")
set(SSL_INCLUDE_DIR ${OPENSSL_INCLUDE_DIR} CACHE PATH "Directory containing SSL includes")
set(SSL_LIBRARY_NAME OpenSSL CACHE STRING "Name of the used SSL library")
set(SSL_ROOT_DIR ${OPENSSL_ROOT_DIR} CACHE PATH "Directory containing SSL libraries and includes")
endif()
message("Use ${SSL_LIBRARY_NAME} at ${SSL_ROOT_DIR}")
message("SSL_INCLUDE_DIR: ${SSL_INCLUDE_DIR} ${LIBRESSL_SSL_LIBRARY} ${LIBRESSL_CRYPTO_LIBRARY}")
if(PAHO_BUILD_SHARED)
## common compilation for libpaho-mqtt3cs and libpaho-mqtt3as