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:
422 files changed
+1013
-599
No files matched your search
+22
-1
@@ -9,23 +9,34 @@
|
||||
#include "dds_handler.h"
|
||||
#include "handler_minelayer_data.h"
|
||||
|
||||
#if BUILD_RTI
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#endif
|
||||
|
||||
using namespace GuezMinelayerProcessing;
|
||||
|
||||
Initialization::Initialization()
|
||||
: m_ddsHandler(nullptr)
|
||||
#if BUILD_RTI
|
||||
, m_handlerMinelayerData(nullptr)
|
||||
#endif
|
||||
{}
|
||||
|
||||
Initialization::~Initialization()
|
||||
{
|
||||
#if BUILD_RTI
|
||||
m_handlerMinelayerData = nullptr;
|
||||
#endif
|
||||
m_ddsHandler = nullptr;
|
||||
}
|
||||
|
||||
bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector)
|
||||
bool Initialization::initialize(
|
||||
#if BUILD_RTI
|
||||
const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector
|
||||
#endif
|
||||
)
|
||||
{
|
||||
#if BUILD_RTI
|
||||
if (m_handlerMinelayerData)
|
||||
return true;
|
||||
|
||||
@@ -44,6 +55,16 @@ bool Initialization::initialize(const std::shared_ptr<DDSConnector::DdsConnector
|
||||
ERROR_LOG(m_logger) << "Initialisation m_handlerMinelayerData failed.";
|
||||
return false;
|
||||
}
|
||||
#else
|
||||
Q_UNUSED(ddsConnector)
|
||||
// initialize DDS stub
|
||||
m_ddsHandler.reset(new DdsHandler());
|
||||
if (!m_ddsHandler->init())
|
||||
{
|
||||
ERROR_LOG(m_logger) << "Initialisation ddsHandler failed.";
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user