Add BUILD_RTI conditionals for RTI/DDS dependent libraries

Systematic fix for BUILD_RTI conditional compilation:
- Lts/Common: Wrap all DDS-dependent libraries in IF(BUILD_RTI)
  - LtsAppManager, LtsCoordTrans, LtsCoordinate, LtsLogin
  - LtsMultiMonitor, LtsPluginManager, LtsPrinting
  - LtsProjectionWorkstation, LtsScriptTimeline, LtsSession
  - LtsTimelineClassic, LtsUtilsCore, LtsUtilsGui, LtsUtilsGuiDds
- Lts/DDS: Add BUILD_RTI guards to Core, DDSConnector, DdsUnitTests, FTC, FTS
- Lts/Plugins: Add BUILD_RTI guards to FilterManagement, OperatorManagement, SituationReplayManagement
- Lts/Proxies: Add BUILD_RTI guards to Buildings, CombatNetRadio, ComponentMonitor, GuezNasat, TrainingAreaBase, TrainingAreaBaseOC
- Lts/Services: Add BUILD_RTI guards to all 30+ service modules
- Z/nglwidgets: Add BUILD_RTI guards, fix Poppler Qt6 headers

Qt6 compatibility fixes:
- LtsCoordTrans: QOverload signal signature, QChar constructor
- LtsMultiMonitor: setMargin→setContentsMargins, remove deprecated HighQualityAntialiasing
- nglwidgets: Poppler Qt5→Qt6 header migration
- Add FindPopplerQt6.cmake for Qt6 Poppler detection

Part of Qt5→Qt6 migration with RTI DDS support.
This commit is contained in:
torsten committed 2026-08-19 00:12:28 +02:00
1 parent 514ded2739
commit cf6d77c030
78 files changed
+265 -114

No files matched your search

@@ -38,6 +38,12 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
NGL_ADD_LIBRARY(WS AAR HLA SV ddscore SHARED ${SRCS_common})
NGL_TARGET_INCLUDE_DIRECTORIES(ddscore
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../
${CMAKE_CURRENT_BINARY_DIR}/../../
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(ddscore
PRIVATE
NGLLogger
@@ -49,12 +55,7 @@ NGL_TARGET_LINK_LIBRARIES(ddscore
RTI::nddscore # RTI_LOG_ANY_FAILURE_s (wo auch immer das herkommt)
RTI::nddscpp2
)
NGL_TARGET_INCLUDE_DIRECTORIES(ddscore
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../
${CMAKE_CURRENT_BINARY_DIR}/../../
)
ENDIF(BUILD_RTI)
NGL_INSTALL_TARGET(ddscore)
@@ -79,6 +80,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcCoreClient
${CMAKE_CURRENT_BINARY_DIR}/../../
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(svcCoreClient
PRIVATE
RTI::nddscpp2
@@ -87,6 +89,7 @@ NGL_TARGET_LINK_LIBRARIES(svcCoreClient
ddscore
ddsftc
)
ENDIF(BUILD_RTI)
NGL_INSTALL_TARGET(svcCoreClient)
#
@@ -22,6 +22,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}/../../
)
IF(BUILD_RTI)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(ddsconnector
PRIVATE
NGLLogger
@@ -35,6 +36,7 @@ NGL_TARGET_LINK_LIBRARIES(ddsconnector
ProjectConfig
Qt6::Core
)
ENDIF(BUILD_RTI)
ELSE()
NGL_TARGET_LINK_LIBRARIES(ddsconnector
PRIVATE
@@ -22,6 +22,7 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
NGL_ADD_LIBRARY(ALL ddsut_common SHARED ${SRCS_common})
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(ddsut_common
PRIVATE
NGLLogger
@@ -33,6 +34,7 @@ NGL_TARGET_LINK_LIBRARIES(ddsut_common
RTI::nddscpp2
ddscore
)
ENDIF(BUILD_RTI)
NGL_TARGET_INCLUDE_DIRECTORIES(ddsut_common
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
@@ -52,9 +52,11 @@ 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
)
ENDIF(BUILD_RTI)
NGL_INSTALL_TARGET(ddsftccore)
@@ -33,6 +33,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}/../../
)
IF(BUILD_RTI)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(ddsfts
PRIVATE
RTI::nddscore
@@ -45,6 +46,7 @@ NGL_TARGET_LINK_LIBRARIES(ddsfts
ddsgen
ddsfts_connext
)
ENDIF(BUILD_RTI)
ELSE()
NGL_TARGET_LINK_LIBRARIES(ddsfts
PRIVATE