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

@@ -20,6 +20,7 @@ NGL_WRAP_UI(LtsAppManager_SRCS
AppChooser/CustomViews/app.ui
)
IF(BUILD_RTI)
NGL_ADD_LIBRARY(WS LtsAppManager SHARED ${LtsAppManager_SRCS})
NGL_TARGET_INCLUDE_DIRECTORIES(LtsAppManager
PUBLIC
@@ -50,3 +51,4 @@ NGL_TARGET_LINK_LIBRARIES(LtsAppManager
)
NGL_INSTALL_TARGET(LtsAppManager)
ENDIF(BUILD_RTI)
@@ -47,6 +47,7 @@ NGL_TARGET_LINK_LIBRARIES(ltsCoordWidget
NGL_TARGET_INCLUDE_DIRECTORIES(ltsCoordWidget
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_SOURCE_DIR}/../LtsUtils/LtsUtilsCore
)
IF(TARGET LtsCoordTrans)
@@ -40,7 +40,7 @@ MgrsEdit::MgrsEdit(int precision, QWidget *widget)
m_ui->leNorth->setValidator(new QIntValidator(0, upperLimit, m_ui->leNorth));
setDefaultMgrsSquares();
connect(m_ui->cbxZone, QOverload<const QString &>::of(&QComboBox::currentIndexChanged),
connect(m_ui->cbxZone, QOverload<int>::of(&QComboBox::currentIndexChanged),
this, &MgrsEdit::onCoordinateDataChanged);
connect(m_ui->leEast, &QLineEdit::editingFinished,
this, &MgrsEdit::onCoordinateDataChanged);
@@ -314,7 +314,7 @@ QValidator::State DoubleValidator::validate(QString &input, int &pos) const
if (ret != QValidator::Acceptable)
return ret;
QLocale l;
const QChar gs(l.groupSeparator());
const QChar gs = l.groupSeparator().at(0);
if (gs.isNull())
return ret;
if (input.contains(gs))
@@ -14,6 +14,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsCoordinate
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}/../
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(LtsCoordinate
PRIVATE
LtsCoordTrans
@@ -22,5 +23,6 @@ NGL_TARGET_LINK_LIBRARIES(LtsCoordinate
LtsUtilsCoreHeaderOnly
Qt6::Core
)
ENDIF(BUILD_RTI)
ADD_SUBDIRECTORY(UnitTest_Coordinate)
@@ -19,6 +19,7 @@ NGL_WRAP_UI(LtsLogin_SRCS
logout_info_dialog.ui
)
IF(BUILD_RTI)
NGL_ADD_LIBRARY2(WS LtsLogin SHARED ${LtsLogin_SRCS})
NGL_TARGET_INCLUDE_DIRECTORIES(LtsLogin
PUBLIC
@@ -40,3 +41,4 @@ NGL_TARGET_LINK_LIBRARIES(LtsLogin
AsmDataPluginInterface
Qt6::Core
)
ENDIF(BUILD_RTI)
@@ -27,6 +27,7 @@ SET(LtsMultiMonitor_SRCS
lts_screen_wide.cpp
)
IF(BUILD_RTI)
NGL_ADD_LIBRARY(WS LtsMultiMonitor SHARED ${LtsMultiMonitor_SRCS})
NGL_TARGET_INCLUDE_DIRECTORIES(LtsMultiMonitor
@@ -47,3 +48,4 @@ NGL_TARGET_LINK_LIBRARIES(LtsMultiMonitor
)
NGL_INSTALL_TARGET(LtsMultiMonitor)
ENDIF(BUILD_RTI)
@@ -283,7 +283,6 @@ void MultiMonitorSelectorBase::drawBase(QPainter &p, bool drawSelector, bool occ
p.save();
p.setRenderHint(QPainter::Antialiasing, true);
p.setRenderHint(QPainter::HighQualityAntialiasing, true);
@@ -242,7 +242,6 @@ void MultiMonitorSelectorWide::paintEvent(QPaintEvent *)
p.save();
p.setRenderHint(QPainter::Antialiasing, true);
p.setRenderHint(QPainter::HighQualityAntialiasing, true);
const QRect centered(centeredRect());
@@ -29,7 +29,7 @@ LtsScreenContainer::LtsScreenContainer(QRect screenGeo)
, m_screenGeo(screenGeo)
{
m_layout->setMargin(0);
m_layout->setContentsMargins(0, 0, 0, 0);
m_layout->setSpacing(0);
m_layout->setStretch(0, 999);
@@ -30,7 +30,6 @@ LtsScreenNormal::LtsScreenNormal(QRect screenGeo, int screenId, bool debugMargin
auto *theLayout = new QHBoxLayout;
theLayout->setContentsMargins(0, 0, 0, 0);
theLayout->setMargin(0);
theLayout->setSpacing(0);
theLayout->setStretch(0, 999);
theLayout->addWidget(m_childContainer);
@@ -32,7 +32,6 @@ LtsScreenWide::LtsScreenWide(const QRect &screenGeo, int screenId, bool debugMar
auto *theLayout = new QHBoxLayout;
theLayout->setContentsMargins(0, 0, 0, 0);
theLayout->setMargin(0);
theLayout->setSpacing(0);
theLayout->setStretch(0, 9999);
@@ -37,6 +37,7 @@ NGL_WRAP_UI(ltspluginmanager_SRCS
Ui/lts_plugin_manager_widget.ui
)
IF(BUILD_RTI)
NGL_ADD_LIBRARY(WS LtsPluginManager SHARED ${ltspluginmanager_SRCS})
NGL_TARGET_INCLUDE_DIRECTORIES(LtsPluginManager
@@ -61,5 +62,6 @@ NGL_TARGET_LINK_LIBRARIES(LtsPluginManager
)
NGL_INSTALL_TARGET(LtsPluginManager)
ENDIF(BUILD_RTI)
NGL_INSTALL_TARGET(LtsPluginLoader)
@@ -15,7 +15,7 @@ SET(SRCS
printing.h
)
if (KDReports_FOUND)
if (KDReports_FOUND AND BUILD_RTI)
NGL_ADD_LIBRARY(WS LtsPrinting SHARED ${SRCS})
NGL_TARGET_INCLUDE_DIRECTORIES(LtsPrinting
PUBLIC
@@ -34,5 +34,5 @@ if (KDReports_FOUND)
)
NGL_INSTALL_TARGET(LtsPrinting)
else()
message(STATUS "KDReports not found; skipping LtsPrinting target")
message(STATUS "KDReports not found or BUILD_RTI disabled; skipping LtsPrinting target")
endif()
@@ -25,6 +25,7 @@ SET(LtsProjectionWorkstation_SRCS
WebSocket/message_factory.cpp
)
IF(BUILD_RTI)
NGL_ADD_LIBRARY(WS LtsProjectionWorkstation SHARED ${LtsProjectionWorkstation_SRCS})
NGL_TARGET_INCLUDE_DIRECTORIES(LtsProjectionWorkstation
@@ -45,3 +46,4 @@ NGL_TARGET_LINK_LIBRARIES(LtsProjectionWorkstation
)
NGL_INSTALL_TARGET(LtsProjectionWorkstation)
ENDIF(BUILD_RTI)
@@ -55,6 +55,9 @@ SET(LtsScriptTimeline_UICS
NGL_WRAP_UI(LtsScriptTimeline_SRCS ${LtsScriptTimeline_UICS})
SET(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/Ui)
IF(BUILD_RTI)
NGL_ADD_LIBRARY2(WS LtsScriptTimeline SHARED ${LtsScriptTimeline_SRCS} ${LtsScriptTimeline_UICS})
NGL_TARGET_INCLUDE_DIRECTORIES(LtsScriptTimeline
@@ -68,3 +71,4 @@ NGL_TARGET_LINK_LIBRARIES(LtsScriptTimeline
LtsWidgets
LtsSessionData
)
ENDIF(BUILD_RTI)
@@ -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)
@@ -45,6 +45,7 @@ SET(timeline_UICS
NGL_WRAP_UI(timeline_SRCS ${timeline_UICS})
IF(BUILD_RTI)
NGL_ADD_LIBRARY2(WS LtsTimelineClassic SHARED ${timeline_SRCS} ${timeline_UICS})
NGL_TARGET_INCLUDE_DIRECTORIES(LtsTimelineClassic
@@ -79,4 +80,5 @@ IF(NEVER)
ENDIF()
NGL_INSTALL_TARGET(LtsTimelineClassic)
ENDIF(BUILD_RTI)
@@ -50,8 +50,7 @@ NGL_TARGET_LINK_LIBRARIES(LtsUtilsCore
#
# --- Tests --------------------------------------------------------------
#
# IF (TARGET ddscore) // does not work, not yet included
IF((BUILD_WS OR BUILD_SV) AND BUILD_TESTING)
IF(BUILD_RTI AND (BUILD_WS OR BUILD_SV) AND BUILD_TESTING)
ADD_EXECUTABLE(utils_test
UnitTests/utils_test.cpp
UnitTests/utils_test.h
@@ -6,6 +6,8 @@
# Created by Mike Wille, SLSE, 2016-09-19
#
ADD_SUBDIRECTORY(LtsUtilsGuiDds)
IF(BUILD_RTI)
ADD_SUBDIRECTORY(LtsUtilsGuiDds)
ENDIF()
ADD_SUBDIRECTORY(ConnectDialog)
ADD_SUBDIRECTORY(StyleManager)
@@ -17,7 +17,9 @@ NGL_ADD_LIBRARY2(WS LtsUtilsGuiDds SHARED ${SRCS})
NGL_TARGET_INCLUDE_DIRECTORIES(LtsUtilsGuiDds
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_SOURCE_DIR}/../../../
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(LtsUtilsGuiDds
PRIVATE
LtsUtilsCoreHeaderOnly
@@ -29,6 +31,7 @@ NGL_TARGET_LINK_LIBRARIES(LtsUtilsGuiDds
Qt6::Core
ddscore
)
ENDIF(BUILD_RTI)
NGL_TARGET_COMPILE_DEFINITIONS(LtsUtilsGuiDds
PUBLIC
REQUEST_HELPER_WITH_GUI
@@ -40,6 +43,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(LtsUtilsDds
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(LtsUtilsDds
PRIVATE
LtsUtilsCoreHeaderOnly
@@ -47,3 +51,4 @@ NGL_TARGET_LINK_LIBRARIES(LtsUtilsDds
Qt6::Core
ddscore
)
ENDIF(BUILD_RTI)