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

Fixed security build.

Browse source 
Signed-off-by: Martin Bremmer <martin.bremmer@adlinktech.com>
This commit is contained in:
Martin Bremmer 2019-11-11 13:11:33 +01:00 • committed by eboasson
parent e53920031f
commit e2afccf4a0
4 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/CMakeLists.txt
View file

@ -16,6 +16,13 @@ if(NOT ${PROJECT_NAME} STREQUAL "CycloneDDS")
message(FATAL_ERROR "Top-level CMakeLists.txt was moved to the top-level directory. Please run cmake on ${dir} instead of ${CMAKE_CURRENT_LIST_DIR}") message(FATAL_ERROR "Top-level CMakeLists.txt was moved to the top-level directory. Please run cmake on ${dir} instead of ${CMAKE_CURRENT_LIST_DIR}")
endif() endif()
# Support the OMG DDS Security within ddsc adds quite a bit of code.
option(ENABLE_SECURITY "Enable OMG DDS Security support" ON)
if(NOT ENABLE_SECURITY)
message(STATUS "Building without OMG DDS Security support")
endif()
add_subdirectory(ddsrt) add_subdirectory(ddsrt)
# some of the tests in the core rely on preprocessing IDL, so idlc has to # some of the tests in the core rely on preprocessing IDL, so idlc has to

5
src/core/CMakeLists.txt
View file

@ -54,10 +54,7 @@ if(ENABLE_SSL)
endif() endif()
# Support the OMG DDS Security within ddsc adds quite a bit of code. # Support the OMG DDS Security within ddsc adds quite a bit of code.
option(ENABLE_SECURITY "Enable OMG DDS Security support" ON) if(ENABLE_SECURITY)
if(NOT ENABLE_SECURITY)
message(STATUS "Building without OMG DDS Security support")
else()
add_definitions(-DDDSI_INCLUDE_SECURITY) add_definitions(-DDDSI_INCLUDE_SECURITY)
target_link_libraries(ddsc PRIVATE security_core) target_link_libraries(ddsc PRIVATE security_core)
target_include_directories( target_include_directories(

2
src/security/builtin_plugins/authentication/CMakeLists.txt
View file

@ -56,7 +56,7 @@ target_include_directories(dds_security_auth
install( install(
TARGETS TARGETS
EXPORT "${CMAKE_PROJECT_NAME}" EXPORT "${PROJECT_NAME}"
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT lib RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT lib
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib

2
src/security/core/CMakeLists.txt
View file

@ -50,7 +50,7 @@ install(
#install( #install(
# TARGETS security_core # TARGETS security_core
# EXPORT "${CMAKE_PROJECT_NAME}" # EXPORT "${PROJECT_NAME}"
# RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT lib # RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT lib
# LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib # LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib
# ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib # ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib