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
+1
-1
@@ -9,7 +9,7 @@
|
||||
#include <Lts/Services/FileManagement/flm_ftc.h>
|
||||
#include <FileManagement/flm_dtc.h>
|
||||
#include <OperatorManagement/opm_dtc.h>
|
||||
#include <DDS/Core/core_dtc.h>
|
||||
#include <Core/core_dtc.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <PluginInterfaces/gui_plugin_interface.h>
|
||||
|
||||
+1
-1
@@ -8,7 +8,7 @@
|
||||
#include "pre_storyboard.h"
|
||||
#include "filter_topic.h"
|
||||
|
||||
#include <DDS/Core/core_dtc.h>
|
||||
#include <Core/core_dtc.h>
|
||||
#include <PluginInterfaces/topic_replay_interface.h>
|
||||
#include <LtsPluginManager/lts_plugin_manager.h>
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@
|
||||
#include "pre_journal_types.h"
|
||||
#include "pre_utils.h"
|
||||
|
||||
#include <DDS/Core/core_dtc.h>
|
||||
#include <Core/core_dtc.h>
|
||||
#include <LtsPluginManager/lts_plugin_manager.h>
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
|
||||
+2
-2
@@ -4,12 +4,12 @@
|
||||
#include "srm_data_plugin.h"
|
||||
#include <utility>
|
||||
|
||||
#include <DDS/Core/core_dtc.h>
|
||||
#include <Core/core_dtc.h>
|
||||
#include <SituationReplayManagement/srm_ftc.h>
|
||||
#include <LtsSession/lts_session_data_dds.h>
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <DDS/QosProfile/DDS_DefaultQos.h>
|
||||
#include <DDS/Core/core_dts_types.h>
|
||||
#include <Core/core_dts_types.h>
|
||||
#include <DDS/DTS/generic_dts_impl.h>
|
||||
#include <SituationReplayManagement/logger.h>
|
||||
#include <LtsUtils/LtsUtilsCore/await.h>
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
#include <SituationReplayManagement/srm_ftc.h>
|
||||
#include <SituationReplayManagement/srm_data_plugin_interface.h>
|
||||
#include <SituationReplayManagement/logger.h>
|
||||
#include <DDS/Core/core_dtc.h>
|
||||
#include <Core/core_dtc.h>
|
||||
#include <LtsSession/lts_session.h>
|
||||
#include <LtsWidgets/lts_dialog.h>
|
||||
#include <LtsUtils/LtsUtilsGui/LtsUtilsGuiDds/request_helper.h>
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <SituationReplayManagement/srm_dtc.h>
|
||||
#include <DDS/Core/core_dtc.h>
|
||||
#include <Core/core_dtc.h>
|
||||
#include <SituationReplayManagement/logger.h>
|
||||
|
||||
#include <LtsWidgets/lts_abstract_table_model.h>
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@
|
||||
|
||||
#include <PluginInterfaces/data_plugin_interface.h>
|
||||
#include <SituationReplayManagement/srm_ftc.h>
|
||||
#include <DDS/Core/core_dtc.h>
|
||||
#include <Core/core_dtc.h>
|
||||
|
||||
namespace Core
|
||||
{
|
||||
|
||||
@@ -7,6 +7,8 @@
|
||||
# Created by Mike Wille, NLSE, 2018-02-15
|
||||
#
|
||||
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
|
||||
# Make ${Qt6_Gui} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
|
||||
set(Qt6_Gui ${Qt6_Gui})
|
||||
@@ -31,6 +33,10 @@ SET(RmeDarkStylePlugin_SRCS
|
||||
NGL_ADD_BIG_RESOURCES(RmeDarkStylePlugin_SRCS resources/rme_dark_style.qrc)
|
||||
NGL_ADD_LIBRARY2(AAR SV WS RmeDarkStylePlugin SHARED ${RmeDarkStylePlugin_SRCS})
|
||||
|
||||
# Add include path for PluginInterfaces for both compilation and AUTOMOC
|
||||
TARGET_INCLUDE_DIRECTORIES(RmeDarkStylePlugin PRIVATE ${CMAKE_SOURCE_DIR}/Lts/Common)
|
||||
set_target_properties(RmeDarkStylePlugin PROPERTIES AUTOMOC_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/Lts/Common")
|
||||
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(RmeDarkStylePlugin
|
||||
PRIVATE
|
||||
|
||||
@@ -10,11 +10,10 @@
|
||||
|
||||
class RmeDarkStyle : public QObject, public StylePlugin::Plugin
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_PLUGIN_METADATA(IID "style:3:rme.dark")
|
||||
Q_INTERFACES(StylePlugin::Plugin)
|
||||
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
RmeDarkStyle();
|
||||
virtual ~RmeDarkStyle();
|
||||
|
||||
@@ -7,6 +7,11 @@
|
||||
# Created by Mike Wille, SLSE, 2016-10-14
|
||||
#
|
||||
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
|
||||
# Add include path for PluginInterfaces before AUTOMOC runs
|
||||
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/Lts/Common)
|
||||
|
||||
# Make ${Qt6_Gui} optional
|
||||
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Gui)
|
||||
set(Qt6_Gui ${Qt6_Gui})
|
||||
@@ -33,6 +38,10 @@ NGL_ADD_LIBRARY(AAR SV WS RmeLightStyleQrc STATIC ${RmeLightStylePlugin_QRC})
|
||||
|
||||
NGL_ADD_LIBRARY(AAR SV WS RmeLightStylePlugin MODULE ${RmeLightStylePlugin_SRCS})
|
||||
|
||||
# Add include path for PluginInterfaces for both compilation and AUTOMOC
|
||||
TARGET_INCLUDE_DIRECTORIES(RmeLightStylePlugin PRIVATE ${CMAKE_SOURCE_DIR}/Lts/Common)
|
||||
set_target_properties(RmeLightStylePlugin PROPERTIES AUTOMOC_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/Lts/Common")
|
||||
|
||||
if(QT6_GUI_AVAILABLE)
|
||||
NGL_TARGET_LINK_LIBRARIES(RmeLightStylePlugin
|
||||
PRIVATE
|
||||
|
||||
@@ -10,11 +10,10 @@
|
||||
|
||||
class RmeLightStyle : public QObject, public StylePlugin::Plugin
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_PLUGIN_METADATA(IID "style:3:rme.light")
|
||||
Q_INTERFACES(StylePlugin::Plugin)
|
||||
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
RmeLightStyle();
|
||||
virtual ~RmeLightStyle();
|
||||
|
||||
Reference in new issue
Block a user