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:
78 files changed
+265
-114
No files matched your search
@@ -5,7 +5,7 @@
|
||||
# Created by Mike Wille, SLSE, 2016-05-15
|
||||
#
|
||||
|
||||
|
||||
IF(BUILD_RTI)
|
||||
# LtsSessionDataDds
|
||||
SET(LtsSessionDataDds_SRCS
|
||||
lts_session_data_dds.cpp
|
||||
@@ -17,6 +17,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsSessionDataDds
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsSessionDataDds
|
||||
PRIVATE
|
||||
ddsconnector
|
||||
@@ -25,6 +26,8 @@ NGL_TARGET_LINK_LIBRARIES(LtsSessionDataDds
|
||||
NGLLogger
|
||||
Qt6::Core
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
ENDIF(BUILD_RTI)
|
||||
|
||||
|
||||
|
||||
@@ -38,6 +41,7 @@ SET(ltssession_SRCS
|
||||
lts_session_lock_handler.cpp
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_ADD_LIBRARY2(WS LtsSession SHARED ${ltssession_SRCS})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(LtsSession
|
||||
PUBLIC
|
||||
@@ -49,7 +53,6 @@ NGL_TARGET_LINK_LIBRARIES(LtsSession
|
||||
Qt6::Network
|
||||
LtsMultiMonitor
|
||||
LtsSessionData
|
||||
ddsconnector
|
||||
LtsUtilsGuiDds # ReqHelpr & for Debug Menu ! TODO: rm on release!
|
||||
LtsNotification
|
||||
svcCoreClient # Core Ftc - for TLH
|
||||
@@ -57,7 +60,6 @@ NGL_TARGET_LINK_LIBRARIES(LtsSession
|
||||
Qt6::Svg
|
||||
PUBLIC
|
||||
LtsWidgets
|
||||
LtsSessionDataDds
|
||||
Qt6::Core
|
||||
GuiPluginInterface
|
||||
DataPluginInterface
|
||||
@@ -65,6 +67,16 @@ NGL_TARGET_LINK_LIBRARIES(LtsSession
|
||||
ProjectConfig
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsSession
|
||||
PRIVATE
|
||||
ddsconnector
|
||||
PUBLIC
|
||||
LtsSessionDataDds
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
ENDIF(BUILD_RTI)
|
||||
|
||||
|
||||
# LtsSessionData (avoid cross-deps between AppManager, Session and PluginManager)
|
||||
SET(LtsSessionData_SRCS
|
||||
@@ -83,5 +95,13 @@ NGL_TARGET_LINK_LIBRARIES(LtsSessionData
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
Qt6::Gui # QPixmap as Storage for Profile Picture
|
||||
ddscore
|
||||
)
|
||||
|
||||
IF(BUILD_RTI)
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsSessionData
|
||||
PUBLIC
|
||||
ddscore
|
||||
)
|
||||
ENDIF(BUILD_RTI)
|
||||
ENDIF(BUILD_RTI)
|
||||
Reference in new issue
Block a user