niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Require OpenSSL by default and add list it as a dependency for Conan

Browse source 
OpenSSL support remains optional, but instead of including it or not solely depending on whether cmake manages to find it, there is now a DDSC_ENABLE_OPENSSL option that defaults to "ON". Setting to OFF removes the dependency. The Conan configuration has been updated to automatically provide openssl 1.1.1a.

Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2019-01-31 17:19:18 +01:00
parent 334a85e0f1
commit b8329ce206
3 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/cmake/modules/FindOpenSSL.cmake
View file

@ -10,8 +10,8 @@
# SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
#
if(TARGET CONAN_PKG::OpenSSL)
add_library(OpenSSL INTERFACE IMPORTED) #ALIAS CONAN_PKG::OpenSSL)
target_link_libraries(OpenSSL INTERFACE CONAN_PKG::OpenSSL)
add_library(OpenSSL::SSL INTERFACE IMPORTED)
target_link_libraries(OpenSSL::SSL INTERFACE CONAN_PKG::OpenSSL)
set(OPENSSL_FOUND TRUE)
else()
# Loop over a list of possible module paths (without the current directory).