move options above where they're used to generate features header

Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
This commit is contained in:
Mikael Arguedas 2020-06-17 23:24:57 +02:00 committed by Jeroen Koekkoek
parent 8029274fec
commit 768b92774f

View file

@ -25,6 +25,9 @@ endif()
# #
# which caters both for those who prefer #ifdef DDS_HAS_SECURITY and for those who prefer # which caters both for those who prefer #ifdef DDS_HAS_SECURITY and for those who prefer
# #if DDS_HAS_SECURITY. # #if DDS_HAS_SECURITY.
option(ENABLE_SECURITY "Enable OMG DDS Security support" ON)
option(ENABLE_LIFESPAN "Enable Lifespan QoS support" ON)
option(ENABLE_DEADLINE_MISSED "Enable Deadline Missed QoS support" ON)
if(ENABLE_SECURITY) if(ENABLE_SECURITY)
set(DDS_HAS_SECURITY "1") set(DDS_HAS_SECURITY "1")
endif() endif()
@ -62,19 +65,16 @@ 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(NOT ENABLE_SECURITY) if(NOT ENABLE_SECURITY)
message(STATUS "Building without OMG DDS Security support") message(STATUS "Building without OMG DDS Security support")
else() else()
add_definitions(-DDDSI_INCLUDE_SECURITY) add_definitions(-DDDSI_INCLUDE_SECURITY)
endif() endif()
option(ENABLE_LIFESPAN "Enable Lifespan QoS support" ON)
if(ENABLE_LIFESPAN) if(ENABLE_LIFESPAN)
add_definitions(-DDDSI_INCLUDE_LIFESPAN) add_definitions(-DDDSI_INCLUDE_LIFESPAN)
endif() endif()
option(ENABLE_DEADLINE_MISSED "Enable Deadline Missed QoS support" ON)
if(ENABLE_DEADLINE_MISSED) if(ENABLE_DEADLINE_MISSED)
add_definitions(-DDDSI_INCLUDE_DEADLINE_MISSED) add_definitions(-DDDSI_INCLUDE_DEADLINE_MISSED)
endif() endif()