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

Build OpenSSL dependent parts only if present

Browse source 
Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2020-06-05 09:07:24 +02:00 • committed by eboasson
parent 6161f5c44d
commit 9c31f48bea
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/security/CMakeLists.txt
View file

@ -15,7 +15,7 @@ if(ENABLE_SECURITY)
add_subdirectory(api) add_subdirectory(api)
add_subdirectory(core) add_subdirectory(core)
if(ENABLE_SSL) if(ENABLE_SSL AND OPENSSL_FOUND)
add_subdirectory(openssl) add_subdirectory(openssl)
add_subdirectory(builtin_plugins) add_subdirectory(builtin_plugins)
endif() endif()

6
src/security/core/tests/CMakeLists.txt
View file

@ -67,7 +67,7 @@ set(security_core_test_sources
"security_utils.c" "security_utils.c"
) )
if(ENABLE_SSL) if(ENABLE_SSL AND OPENSSL_FOUND)
add_wrapper(access_control dds_security_ac) add_wrapper(access_control dds_security_ac)
add_wrapper(authentication dds_security_auth) add_wrapper(authentication dds_security_auth)
add_wrapper(cryptography dds_security_crypto) add_wrapper(cryptography dds_security_crypto)
@ -102,7 +102,7 @@ target_include_directories(
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../core/ddsi/include>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../core/ddsi/include>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../core/ddsc/src>" "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../../core/ddsc/src>"
) )
if(ENABLE_SSL) if(ENABLE_SSL AND OPENSSL_FOUND)
target_include_directories( target_include_directories(
cunit_security_core PRIVATE cunit_security_core PRIVATE
"$<BUILD_INTERFACE:$<TARGET_PROPERTY:security_openssl,INTERFACE_INCLUDE_DIRECTORIES>>" "$<BUILD_INTERFACE:$<TARGET_PROPERTY:security_openssl,INTERFACE_INCLUDE_DIRECTORIES>>"
@ -114,7 +114,7 @@ set(plugin_wrapper_lib_dir "${CMAKE_CURRENT_BINARY_DIR}")
configure_file("common/config_env.h.in" "common/config_env.h") configure_file("common/config_env.h.in" "common/config_env.h")
target_link_libraries(cunit_security_core PRIVATE ddsc security_api SecurityCoreTests) target_link_libraries(cunit_security_core PRIVATE ddsc security_api SecurityCoreTests)
if(ENABLE_SSL) if(ENABLE_SSL AND OPENSSL_FOUND)
target_link_libraries(cunit_security_core PRIVATE dds_security_auth dds_security_ac dds_security_crypto dds_security_access_control_wrapper dds_security_authentication_wrapper dds_security_cryptography_wrapper) target_link_libraries(cunit_security_core PRIVATE dds_security_auth dds_security_ac dds_security_crypto dds_security_access_control_wrapper dds_security_authentication_wrapper dds_security_cryptography_wrapper)
target_link_libraries(cunit_security_core PRIVATE OpenSSL::SSL) target_link_libraries(cunit_security_core PRIVATE OpenSSL::SSL)
target_link_libraries(cunit_security_core PRIVATE security_openssl) target_link_libraries(cunit_security_core PRIVATE security_openssl)