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:
256 files changed
+1170
-610
No files matched your search
+6
@@ -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
|
||||
|
||||
+1
-1
@@ -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>
|
||||
|
||||
+1
-1
@@ -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"
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@
|
||||
|
||||
#include "dds_handler.h"
|
||||
|
||||
#include <DDS/Core/pacemaker.h>
|
||||
#include <Core/pacemaker.h>
|
||||
|
||||
namespace ApHlaJson
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user