BUILD_RTI guards for DDS/Routing modules + logger init fixes

- Lts/DDS: Add BUILD_RTI guards to pacemaker.h, dds_connector.h,
  generic_fts_* files, generic_base.h, routing_plugin.h
- Lts/Services/RoutingServiceNG: Add BUILD_RTI guards to session.h/cpp,
  connection.h/cpp, data_writer_task.h/cpp
- Fix C++23 reference member initialization: use getLogger() instead of
  getNGLLogger() in constructor initializer lists
- Root CMakeLists.txt: Add Lts/DDS to include_directories
- Fix export header generation order (GENERATE_EXPORT_HEADER before
  TARGET_INCLUDE_DIRECTORIES)
- Remove auto-generated stub files (external deps collected separately)
This commit is contained in:
torsten committed 2026-08-21 21:57:27 +02:00
1 parent 6588fc7d3f
commit 3cc3129de0
27 files changed
+339 -92

No files matched your search

@@ -8,7 +8,9 @@
#include "dds_handler.h"
#if BUILD_RTI
#include <DDS/Core/pacemaker.h>
#endif
namespace GuezMinelayerProcessing
{
@@ -16,14 +18,14 @@ namespace GuezMinelayerProcessing
#if BUILD_RTI
DdsHandler::DdsHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
: m_ddsConnector(ddsConnector)
, m_logger(getNGLLogger("GuezMinelayerProcessing.DdsHandler"))
, m_logger(getLogger("GuezMinelayerProcessing.DdsHandler"))
, m_topicLockMaster(std::make_shared<Core::TopicLockMaster>())
{
DEBUG_LOG(m_logger) << "DdsHandler(" << ddsConnector->getDomainId() << ") for partition: " << m_ddsConnector->getDefaultPartition();
}
#else
DdsHandler::DdsHandler()
: m_logger(getNGLLogger("GuezMinelayerProcessing.DdsHandler"))
: m_logger(getLogger("GuezMinelayerProcessing.DdsHandler"))
{
DEBUG_LOG(m_logger) << "DdsHandler() - RTI DDS not enabled";
}
@@ -28,6 +28,7 @@ namespace GuezMinelayerProcessing
HandlerMinelayerData::HandlerMinelayerData(const std::shared_ptr<DdsHandler> &ddsHandler,
QObject *parent)
: QObject(parent)
, m_logger(getLogger("GuezMinelayerProcessing.HandlerMinelayerData"))
, m_ddsHandler(ddsHandler)
#if BUILD_RTI
, m_tabDtc(nullptr)
@@ -375,6 +376,7 @@ namespace GuezMinelayerProcessing
HandlerMinelayerData::HandlerMinelayerData(const std::shared_ptr<DdsHandler> &ddsHandler,
QObject *parent)
: QObject(parent)
, m_logger(getLogger("GuezMinelayerProcessing.HandlerMinelayerData"))
, m_ddsHandler(ddsHandler)
{}
@@ -16,7 +16,8 @@
using namespace GuezMinelayerProcessing;
Initialization::Initialization()
: m_ddsHandler(nullptr)
: m_logger(getLogger("GuezMinelayerProcessing.Initialization"))
, m_ddsHandler(nullptr)
#if BUILD_RTI
, m_handlerMinelayerData(nullptr)
#endif
@@ -56,7 +57,6 @@ bool Initialization::initialize(
return false;
}
#else
Q_UNUSED(ddsConnector)
// initialize DDS stub
m_ddsHandler.reset(new DdsHandler());
if (!m_ddsHandler->init())