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

@@ -4,55 +4,55 @@
# $Author$
#
set(CMAKE_AUTOMOC ON)
# DataPluginInterface
ADD_INTERFACE_LIBRARY(
DataPluginInterface
ADD_LIBRARY(DataPluginInterface SHARED
${CMAKE_CURRENT_SOURCE_DIR}/data_plugin_interface.h
${CMAKE_CURRENT_SOURCE_DIR}/..
Qt6::Core
${CMAKE_CURRENT_SOURCE_DIR}/data_plugin_interface.cpp
)
set_target_properties(DataPluginInterface PROPERTIES AUTOMOC ON)
TARGET_INCLUDE_DIRECTORIES(DataPluginInterface PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..)
TARGET_LINK_LIBRARIES(DataPluginInterface PUBLIC Qt6::Core)
# GuiPluginInterface
ADD_INTERFACE_LIBRARY(
GuiPluginInterface
ADD_LIBRARY(GuiPluginInterface SHARED
${CMAKE_CURRENT_SOURCE_DIR}/gui_plugin_interface.h
${CMAKE_CURRENT_SOURCE_DIR}/..
Qt6::Core LtsWidgets ProjectConfig LtsAppDescriptor LtsUtilsCore
${CMAKE_CURRENT_SOURCE_DIR}/gui_plugin_interface.cpp
)
set_target_properties(GuiPluginInterface PROPERTIES AUTOMOC ON)
TARGET_INCLUDE_DIRECTORIES(GuiPluginInterface PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..)
TARGET_LINK_LIBRARIES(GuiPluginInterface PUBLIC Qt6::Core LtsWidgets ProjectConfig LtsAppDescriptor LtsUtilsCore)
# projectPluginInterface
ADD_INTERFACE_LIBRARY(
ProjectPluginInterface
ADD_LIBRARY(ProjectPluginInterface SHARED
${CMAKE_CURRENT_SOURCE_DIR}/project_plugin_interface.h
${CMAKE_CURRENT_SOURCE_DIR}/..
Qt6::Core
${CMAKE_CURRENT_SOURCE_DIR}/project_plugin_interface.cpp
)
set_target_properties(ProjectPluginInterface PROPERTIES AUTOMOC ON)
TARGET_INCLUDE_DIRECTORIES(ProjectPluginInterface PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..)
TARGET_LINK_LIBRARIES(ProjectPluginInterface PUBLIC Qt6::Core)
# stylePluginInterface
ADD_INTERFACE_LIBRARY(
StylePluginInterface
ADD_LIBRARY(StylePluginInterface SHARED
${CMAKE_CURRENT_SOURCE_DIR}/style_plugin_interface.h
${CMAKE_CURRENT_SOURCE_DIR}/..
Qt6::Core
${CMAKE_CURRENT_SOURCE_DIR}/style_plugin_interface.cpp
)
set_target_properties(StylePluginInterface PROPERTIES AUTOMOC ON)
TARGET_INCLUDE_DIRECTORIES(StylePluginInterface PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..)
TARGET_LINK_LIBRARIES(StylePluginInterface PUBLIC Qt6::Core)
# record_replay_plugin
ADD_INTERFACE_LIBRARY(
RecordReplayPlugin
ADD_LIBRARY(RecordReplayPlugin SHARED
${CMAKE_CURRENT_SOURCE_DIR}/record_replay_plugin.h
${CMAKE_CURRENT_SOURCE_DIR}/..
Qt6::Core
${CMAKE_CURRENT_SOURCE_DIR}/record_replay_plugin.cpp
)
set_target_properties(RecordReplayPlugin PROPERTIES AUTOMOC ON)
TARGET_INCLUDE_DIRECTORIES(RecordReplayPlugin PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..)
TARGET_LINK_LIBRARIES(RecordReplayPlugin PUBLIC Qt6::Core)
# Topic Replay Interface
ADD_INTERFACE_LIBRARY(
TopicReplayInterface
ADD_LIBRARY(TopicReplayInterface SHARED
${CMAKE_CURRENT_SOURCE_DIR}/topic_replay_interface.h
${CMAKE_CURRENT_SOURCE_DIR}/..
Qt6::Core
${CMAKE_CURRENT_SOURCE_DIR}/topic_replay_interface.cpp
)
TARGET_INCLUDE_DIRECTORIES(TopicReplayInterface PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/..
${CMAKE_BINARY_DIR}/Lts/Common/TopicEditorBase # topiceditorbase_export.h
)
TARGET_LINK_LIBRARIES(TopicReplayInterface PUBLIC Qt6::Core TopicEditorBase)
@@ -21,8 +21,7 @@ namespace DataPluginBase
class Interface
{
public:
Interface() = default;
public:
virtual ~Interface() = default;
};
@@ -7,8 +7,8 @@
#include <LtsWidgets/lts_base.h>
#include <ProjectConfig/project_defines.h>
#include <QtCore/QFlags>
#include <QtCore/QObject>
#include <QtCore/QVector>
#include <QObject>
#include <memory>
namespace NGL
@@ -33,8 +33,9 @@ class Interface;
class Plugin
{
Q_GADGET
public:
Plugin() = default;
virtual ~Plugin() = default;
virtual QString pluginName() = 0;
@@ -2,14 +2,16 @@
#pragma once
#include <QtCore/QObject>
#include <QObject>
namespace ProjectPlugin
{
class Plugin
{
public:
Plugin() = default;
Q_GADGET
public:
virtual ~Plugin() = default;
};
@@ -3,8 +3,8 @@
#pragma once
#include <QtCore/QHash>
#include <QtCore/QObject>
#include <QtCore/QString>
#include <QObject>
#include <map>
#include <memory>
@@ -19,8 +19,9 @@ namespace RecordReplay
{
class RecordReplayPlugin
{
Q_GADGET
public:
RecordReplayPlugin() = default;
virtual ~RecordReplayPlugin() = default;
virtual QString pluginName() const = 0;
@@ -2,14 +2,15 @@
#pragma once
#include <QtCore/QObject>
#include <QObject>
namespace StylePlugin
{
class Plugin
{
Q_GADGET
public:
Plugin() = default;
virtual ~Plugin() = default;
virtual void loadStyle(bool highDpi) = 0;