1
0
Fork 0

Use the find_dependency option to parse Simgear dependencies to FlightGear

This commit is contained in:
Erik Hofman 2021-03-08 16:15:51 +01:00
parent c0bc09bf1a
commit af329b794f
2 changed files with 6 additions and 16 deletions

View file

@ -162,7 +162,6 @@ 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_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,17 +351,12 @@ find_package(SimGear ${MIN_SIMGEAR_VERSION} CONFIG REQUIRED)
##############################################################################
if(ENABLE_CYCLONE)
if (NOT TARGET CycloneDDS::ddsc)
find_package(CycloneDDS QUIET)
endif()
if (CycloneDDS_FOUND)
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_CYCLONE)
if (SG_HAVE_DDS)
message(STATUS "Data Distribution Service support: CycloneDDS")
set(FG_HAVE_DDS 1)
else()
message(STATUS "Data Distribution Service support: DISBLED")
endif()
if(ENABLE_RTI)
message(STATUS "RTI: ENABLED")

View file

@ -108,10 +108,6 @@ else()
install(TARGETS fgfs RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()
if (CycloneDDS_FOUND)
target_link_libraries(fgfs CycloneDDS::ddsc)
endif(CycloneDDS_FOUND)
if (TARGET sentry::sentry)
target_link_libraries(fgfs sentry::sentry)
endif()