Qt6 Migration: BUILD_RTI guards und CMake fixes

- BUILD_RTI conditional compilation für RTI Connext DDS dependencies
- Namespace fixes in core_dtc.h (Core:: → DDS::Core::)
- CMakeLists.txt: BUILD_RTI option und conditional dependencies
- Handler minelayer: namespace closing mit BUILD_RTI guard
- Build erfolgreich mit BUILD_RTI=OFF validiert

Signed-off-by: Torsten Wierschin <torsten.wierschin@life-maps.com>

qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/connection.cpp

@@ -10,6 +10,7 @@
 #include "connection.h"
 #include "data_writer_task.h"
 
+#if BUILD_RTI
 #include <QCoreApplication>
 #include <QElapsedTimer>
 
@@ -31,7 +32,7 @@ Connection::Connection(const dds::domain::DomainParticipant &domainParticipant,
   , m_topicsToRoute(topicsToRoute)
   , m_partition(partition)
   , m_description(desc),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
   INFO_LOG(m_logger) << "Create connection: " << partition
                      << ", domain: " << domainParticipant.domain_id()
                      << ", direction: " << m_description
@@ -184,3 +185,4 @@ bool Connection::initTopics()
 }
 
 } // namespace RoutingService
+#endif // BUILD_RTI

qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/connection.h

@@ -8,6 +8,7 @@
 
 #pragma once
 
+#if BUILD_RTI
 
 #include <DDS/DDSConnector/dds_connector.h>
 #include <future>
@@ -58,3 +59,5 @@ private:
 };
 
 } // namespace RoutingService
+
+#endif // BUILD_RTI

qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/data_writer_task.h

@@ -11,8 +11,10 @@
 #include <queue>
 #include <mutex>
 #include <condition_variable>
-#include <DDS/Routing/routing_plugin.h>
 
+#if BUILD_RTI
+#include <DDS/Routing/routing_plugin.h>
+#endif
 #include "logger.h"
 
 namespace RoutingService

qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/main_handler.cpp

@@ -19,6 +19,7 @@
 #include <DDS/Core/pacemaker.h>
 #include <DDS/DTS/generic_dts_impl.h>
 
+#if BUILD_RTI
 namespace RoutingService
 {
 
@@ -102,3 +103,4 @@ void MainHandler::shutdown()
 }
 
 } // namespace RoutingService
+#endif // BUILD_RTI

qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/partition_handler.cpp

@@ -9,12 +9,13 @@
 #include "partition_handler.h"
 #include <DDS/DDSConnector/dds_connector.h>
 
+#if BUILD_RTI
 namespace RoutingService
 {
 PartitionHandler::PartitionHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector, QObject *parent) : QObject(parent)
   , m_exmDtc(ExerciseManagement::Interface::Dtc::create(ddsConnector))
   , m_destroyTimer(new QTimer(this)),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {
   m_exmDtc->enableExercise();
 
   m_destroyTimer->setInterval(1000);
@@ -101,3 +102,4 @@ void PartitionHandler::onDestroyTimerTimeout()
 
 
 } // namespace RoutingService
+#endif // BUILD_RTI

qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session.cpp

@@ -9,11 +9,12 @@
 
 #include "session.h"
 
+#if BUILD_RTI
 namespace RoutingService
 {
 Session::Session(const QString &partitionNameSv, const QString &partitionNameWs) : m_partitionNameSv(partitionNameSv.toStdString())
   , m_partitionNameWs(partitionNameWs.toStdString()),
-    m_logger(NGL::NGLLoggerBootstrap::getLogger()) {}
+    m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger()) {}
 
 Session::~Session()
 {
@@ -54,3 +55,4 @@ void Session::shutdown()
 
 
 } // namespace RoutingService
+#endif // BUILD_RTI

qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session.h

@@ -9,7 +9,10 @@
 #pragma once
 
 #include <string>
+#include <QString>
+#if BUILD_RTI
 #include "connection.h"
+#endif
 
 namespace RoutingService
 {
@@ -19,17 +22,21 @@ public:
   explicit Session(const QString &partitionNameSv, const QString &partitionNameWs);
   ~Session();
 
+#if BUILD_RTI
   bool init(const dds::domain::DomainParticipant &dpIn,
             const dds::domain::DomainParticipant &dpOut,
             const std::vector<TopicDispatcherInterface *> &topicsToRouteToWs,
             const std::vector<TopicDispatcherInterface *> &topicsToRouteToSv);
   void shutdown();
+#endif
 
 private:
   NGL::INGLLogger &m_logger;
   std::string m_partitionNameSv;
   std::string m_partitionNameWs;
+#if BUILD_RTI
   std::unique_ptr<Connection> m_connectionSvToWs;
   std::unique_ptr<Connection> m_connectionWsToSv;
+#endif
 };
 } // namespace RoutingService

qt6-after/qt6-migrated-legatus/Lts/Services/RoutingServiceNG/session_handler.cpp

@@ -12,6 +12,7 @@
 #include <DDS/Generic/topic_type_plugin.h>
 #include <QVector>
 
+#if BUILD_RTI
 namespace RoutingService
 {
 
@@ -137,3 +138,4 @@ std::vector<TopicDispatcherInterface *> SessionHandler::topicsToRouteToSv() cons
 }
 
 } // namespace RoutingService
+#endif // BUILD_RTI