fly/flightgear
1
0
Fork 0
Code Activity

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

Browse source
This commit is contained in:
Erik Hofman 2021-03-06 09:10:34 +01:00
parent 5786d40272
commit ffc0105b47
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
CMakeLists.txt
View file

@ -162,7 +162,7 @@ option(ENABLE_LARCSIM "Set to ON to build FlightGear with LaRCsim FDM" ON)
option(ENABLE_YASIM "Set to ON to build FlightGear with YASIM FDM (default)" ON)
option(ENABLE_JSBSIM "Set to ON to build FlightGear with JSBSim FDM (default)" ON)
option(EVENT_INPUT "Set to ON to build FlightGear with event-based Input support" ${EVENT_INPUT_DEFAULT})
option(ENABLE_DDS "Set to ON to build FlightGear with DDS support" ON)
option(ENABLE_CYCLONE "Set to ON to build FlightGear with Cyclone Data Distribution Service support" ON)
option(ENABLE_RTI "Set to ON to build FlightGear with RTI support" OFF)
option(SYSTEM_SQLITE "Set to ON to build FlightGear with the system's SQLite3 library" OFF)
option(ENABLE_IAX "Set to ON to build FlightGear with IAXClient/fgcom built-in (default)" ON)
@ -352,15 +352,17 @@ find_package(SimGear ${MIN_SIMGEAR_VERSION} CONFIG REQUIRED)
##############################################################################
if(ENABLE_DDS)
if(ENABLE_CYCLONE)
if (NOT TARGET CycloneDDS::ddsc)
find_package(CycloneDDS QUIET)
endif()
if (CycloneDDS_FOUND)
message(STATUS "DDS: ENABLED")
message(STATUS "Data Distribution Service support: CycloneDDS")
set(FG_HAVE_DDS 1)
else(CycloneDDS_FOUND)
message(STATUS "Data Distribution Service support: DISBLED")
endif(CycloneDDS_FOUND)
endif(ENABLE_DDS)
endif(ENABLE_CYCLONE)
if(ENABLE_RTI)
message(STATUS "RTI: ENABLED")

2
src/Network/native_ctrls.cxx
View file

@ -30,7 +30,7 @@
#include <simgear/io/lowlevel.hxx> // endian tests
#if FG_HAVE_DDS
#include <simgear/io/sg_dds.hxx>
#include <simgear/io/SGDataDistributionService.hxx>
#endif
#include <Main/fg_props.hxx>

2
src/Network/native_fdm.cxx
View file

@ -31,7 +31,7 @@
#include <simgear/timing/sg_time.hxx>
#if FG_HAVE_DDS
#include <simgear/io/sg_dds.hxx>
#include <simgear/io/SGDataDistributionService.hxx>
#endif
#include <FDM/flightProperties.hxx>

2
src/Network/native_gui.cxx
View file

@ -32,7 +32,7 @@
#include <simgear/timing/sg_time.hxx>
#if FG_HAVE_DDS
#include <simgear/io/sg_dds.hxx>
#include <simgear/io/SGDataDistributionService.hxx>
#endif
#include <Main/fg_props.hxx>