Fix BUILD_RTI=OFF build: Guard RTI-only DDS modules

- LtsUtilsSettings: Fix export header include path (angle brackets)
- LtsWidgets: Move LtsUtilsSettings to PUBLIC link libraries
- BatteryNotification: Remove unused QDesktopWidget include
- DDS/FTC: Wrap ddsftccore library in IF(BUILD_RTI) guards
- DDS/FTS: Remove ELSE block, wrap entire library in IF(BUILD_RTI)
- DDS/DTC: Wrap entire library definition in IF(BUILD_RTI)
- DDS/DTS: Wrap entire library definition in IF(BUILD_RTI)
- DDS/DDSConnector: Wrap entire library in IF(BUILD_RTI), remove ELSE
- DDS/Routing: Wrap entire library in IF(BUILD_RTI)

All RTI Connext DDS-specific libraries (ddscore, ddsQoS, ddsgen,
ddsdtc, ddsdts, ddsfts, ddsconnector, routing_plugin) are now
properly guarded so BUILD_RTI=OFF builds can succeed.
This commit is contained in:
torsten committed 2026-08-23 01:19:06 +02:00
1 parent f6cbb9021f
commit c042faae9e
9 files changed
+48 -60

No files matched your search

@@ -11,20 +11,6 @@ TARGET_INCLUDE_DIRECTORIES(ddsftc
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}/../../
)
IF(BUILD_RTI)
TARGET_LINK_LIBRARIES(ddsftc
INTERFACE
Qt6::Core
ddsfts_connext
ddscore # due to the usage of Core::FtReplyState inside generic_ftc_impl.h, only on core.hpp - fixme :/
ddsgen
ddsQoS
RTI::nddsc
RTI::nddscpp2
ddsftccore
LtsUtilsCoreHeaderOnly
)
ELSE()
TARGET_LINK_LIBRARIES(ddsftc
INTERFACE
Qt6::Core
@@ -34,6 +20,13 @@ TARGET_LINK_LIBRARIES(ddsftc
ddsftccore
LtsUtilsCoreHeaderOnly
)
IF(BUILD_RTI)
TARGET_LINK_LIBRARIES(ddsftc
INTERFACE
ddsfts_connext
RTI::nddsc
RTI::nddscpp2
)
ENDIF()
SET(SRCS
${CMAKE_CURRENT_SOURCE_DIR}/generic_ftc.h
@@ -47,16 +40,19 @@ TARGET_SOURCES(ddsftc INTERFACE ${SRCS})
# ddsftccore
IF(BUILD_RTI)
NGL_ADD_LIBRARY2(WS SV HLA ddsftccore SHARED abstract_requester.h abstract_requester.cpp)
NGL_TARGET_INCLUDE_DIRECTORIES(ddsftccore
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../ # 'DDS/FTC/...' reads better than only FTC
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(ddsftccore
PUBLIC
Qt6::Core
ddscore
ddsfts_connext
RTI::nddsc
RTI::nddscpp2
)
ENDIF(BUILD_RTI)
NGL_INSTALL_TARGET(ddsftccore)
ENDIF(BUILD_RTI)