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>
This commit is contained in:
torsten committed 2026-08-21 18:37:18 +02:00
1 parent c599be63e3
commit 950d669538
422 files changed
+1013 -599

No files matched your search

@@ -13,14 +13,26 @@
namespace GuezMinelayerProcessing
{
#if BUILD_RTI
DdsHandler::DdsHandler(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
: m_ddsConnector(ddsConnector)
, m_logger(getNGLLogger("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_topicLockMaster(std::make_shared<Core::TopicLockMaster>())
{
DEBUG_LOG(m_logger) << "DdsHandler() - RTI DDS not enabled";
}
#endif
bool DdsHandler::init(const QStringList &qosFileList)
{
#if BUILD_RTI
if (!m_ddsConnector->init(qosFileList))
{
ERROR_LOG(m_logger) << "Error initializing dds connections - aborting";
@@ -29,6 +41,10 @@ bool DdsHandler::init(const QStringList &qosFileList)
// default initialize Publisher and Subscriber
m_ddsConnector->initPublisherSubscriber();
#else
Q_UNUSED(qosFileList)
DEBUG_LOG(m_logger) << "DdsHandler::init() - RTI DDS not enabled, skipping initialization";
#endif
return true;
}