Per request: Rename DDS to DataDistributionService to prevent confusion with DDS the image format.

This commit is contained in:
Erik Hofman 2021-03-06 09:10:20 +01:00
parent ae573877da
commit 09156b90fe
4 changed files with 11 additions and 9 deletions

View File

@ -91,7 +91,7 @@ set(SYSTEM_UDNS OFF)
endif() endif()
option(SIMGEAR_HEADLESS "Set to ON to build SimGear without GUI/graphics support" OFF) option(SIMGEAR_HEADLESS "Set to ON to build SimGear without GUI/graphics support" OFF)
option(ENABLE_DDS "Set to ON to build FlightGear with DDS support" ON) option(ENABLE_CYCLONE "Set to ON to build SimGear with Cyclone Data Distribution Service support" ON)
option(ENABLE_RTI "Set to ON to build SimGear with RTI support" OFF) option(ENABLE_RTI "Set to ON to build SimGear with RTI support" OFF)
option(ENABLE_GDAL "Set to ON to build SimGear with GDAL support" OFF) option(ENABLE_GDAL "Set to ON to build SimGear with GDAL support" OFF)
option(ENABLE_TESTS "Set to OFF to disable building SimGear's test applications" ON) option(ENABLE_TESTS "Set to OFF to disable building SimGear's test applications" ON)
@ -210,14 +210,16 @@ else()
message(STATUS "RTI: DISABLED") message(STATUS "RTI: DISABLED")
endif(ENABLE_RTI) endif(ENABLE_RTI)
if(ENABLE_DDS) if(ENABLE_CYCLONE)
if (NOT TARGET CycloneDDS::ddsc) if (NOT TARGET CycloneDDS::ddsc)
find_package(CycloneDDS QUIET) find_package(CycloneDDS QUIET)
endif() endif()
if (CycloneDDS_FOUND) if (CycloneDDS_FOUND)
message(STATUS "DDS: ENABLED") message(STATUS "Data Distribution Service support: CycloneDDS")
else(CycloneDDS_FOUND)
message(STATUS "Data Distribution Service support: DISBLED")
endif(CycloneDDS_FOUND) endif(CycloneDDS_FOUND)
endif(ENABLE_DDS) endif(ENABLE_CYCLONE)
if(ENABLE_GDAL) if(ENABLE_GDAL)
find_package(GDAL 2.0.0 REQUIRED) find_package(GDAL 2.0.0 REQUIRED)

View File

@ -48,10 +48,10 @@ set(SOURCES
if (CycloneDDS_FOUND) if (CycloneDDS_FOUND)
set(HEADERS ${HEADERS} set(HEADERS ${HEADERS}
sg_dds.hxx SGDataDistributionService.hxx
) )
set(SOURCES ${SOURCES} set(SOURCES ${SOURCES}
sg_dds.cxx SGDataDistributionService.cxx
) )
endif (CycloneDDS_FOUND) endif (CycloneDDS_FOUND)

View File

@ -1,4 +1,4 @@
// sg_dds.cxx -- Data Distribution Service (DDS) I/O routines // SGDataDistributionService.cxx -- Data Distribution Service (DDS) I/O routines
// //
// Written by Erik Hofman, started March 2021. // Written by Erik Hofman, started March 2021.
// //
@ -28,7 +28,7 @@
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>
#include "sg_dds.hxx" #include "SGDataDistributionService.hxx"
#define FG_DDS_DOMAIN DDS_DOMAIN_DEFAULT #define FG_DDS_DOMAIN DDS_DOMAIN_DEFAULT

View File

@ -1,5 +1,5 @@
/** /**
* \file sg_dds.hxx * \file SGDataDistributionService.hxx
* Data Distribution Service (DDS) I/O routines * Data Distribution Service (DDS) I/O routines
*/ */