Migration of Legatus codebase to Qt6 with RTI Connext DDS 7.7 integration is partially complete. Core DDS targets build successfully, but ProjectDataManagement module blocks full ddsfts compilation due to IDL definition conflicts.

This commit is contained in:
torsten committed 2026-09-07 19:30:39 +02:00
1 parent 758ae0f53f
commit ba1d9e2c04
256 files changed
+1170 -610

No files matched your search

@@ -85,7 +85,8 @@ IF(BUILD_RTI)
CODEGEN_DATABASE(SRCS_common ${xml_FILE})
# Generate *.cpp/*.hpp from idl (only with BUILD_RTI)
RTIDDSGEN(SRCS_common tab_enums.idl)
RTIDDSGEN(SRCS_common tab.idl)
# tab.idl includes pdm.idl, so add explicit dependency on pdm.idl generation
RTIDDSGEN(SRCS_common tab.idl DEPENDS ${CMAKE_BINARY_DIR}/Lts/Services/ProjectDataManagement/pdm.idl)
# Generate tab_dt[s,c]_types.h, tab_ft[s,c]_types.h
CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
# generate tab_[d|f]tc.h
@@ -30,6 +30,7 @@ NGL_TARGET_INCLUDE_DIRECTORIES(saaTelegrams
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../
${CMAKE_BINARY_DIR}/Lts/Services
)
NGL_TARGET_LINK_LIBRARIES(saaTelegrams
# svcPdmClient # Externe Dependency - nicht verfügbar
@@ -37,6 +38,11 @@ NGL_TARGET_LINK_LIBRARIES(saaTelegrams
${Qt6_WebSockets}
)
# Ensure PDM IDL files are generated before building saaTelegrams
if(TARGET svcPdmCommon)
add_dependencies(saaTelegrams svcPdmCommon)
endif()
SET(SRCS
logger.cpp
logger.h
@@ -3,7 +3,7 @@
#include "aes_handler.h"
#include <utility>
#include "DDS/Core/core_types.h"
#include "Core/core_types.h"
#include "aes.hpp"
#include "json_dispatcher.h"
#include <QtCore/QJsonArray>
@@ -3,7 +3,7 @@
#pragma once
#include "DDS/Core/core_types.h"
#include "Core/core_types.h"
#include "logger.h"
#include "main_dispatcher.h"
#include "telegrams.h"
@@ -6,7 +6,7 @@
#include "json_dispatcher.h"
#include <nglsettings/nglsettings_settings.h>
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
#include <QtCore/QTimer>
namespace AdlerJson
@@ -3,7 +3,7 @@
#include "dds_handler.h"
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
namespace ApHlaJson
{
@@ -7,7 +7,7 @@
#include <DDS/DDSConnector/publisher.h>
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
#include <DDS/DTC/generic_dtc_impl.h>
#include <DDS/DTS/generic_dts_impl.h>
@@ -5,7 +5,7 @@
#if BUILD_RTI
#include <DDS/DDSConnector/dds_connector.h>
#include <DDS/Core/core_dtc_types.h>
#include <Core/core_dtc_types.h>
#include <TrainingAreaBase/tab_dts_types.h>
#include <TrainingAreaBase/tab_dts.h>
@@ -9,7 +9,7 @@
#include "WebSocketInterface/json_keys.h"
#include <AssetManagement/asm_dtc.h>
#include <DDS/Core/pacemaker.h>
#include <Core/pacemaker.h>
#include <ExerciseManagement/exm_dtc.h>
#include <LtsPluginManager/lts_plugin_loader.h>
#include <TrainingAreaBase/tab_record_replay_plugin.h>
@@ -45,6 +45,7 @@ public:
class Plugin
{
Q_GADGET
public:
Plugin() = default;
virtual ~Plugin() = default;