From 768b92774f56a36434d40cd84f760a5edcd88ddd Mon Sep 17 00:00:00 2001 From: Mikael Arguedas Date: Wed, 17 Jun 2020 23:24:57 +0200 Subject: [PATCH] move options above where they're used to generate features header Signed-off-by: Mikael Arguedas --- src/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9e5f5c7..4cea551 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -25,6 +25,9 @@ endif() # # which caters both for those who prefer #ifdef DDS_HAS_SECURITY and for those who prefer # #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) set(DDS_HAS_SECURITY "1") endif() @@ -62,19 +65,16 @@ if(ENABLE_SSL) 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") else() add_definitions(-DDDSI_INCLUDE_SECURITY) endif() -option(ENABLE_LIFESPAN "Enable Lifespan QoS support" ON) if(ENABLE_LIFESPAN) add_definitions(-DDDSI_INCLUDE_LIFESPAN) endif() -option(ENABLE_DEADLINE_MISSED "Enable Deadline Missed QoS support" ON) if(ENABLE_DEADLINE_MISSED) add_definitions(-DDDSI_INCLUDE_DEADLINE_MISSED) endif()