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
@@ -7,10 +7,12 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
|
||||
#include "logger.h"
|
||||
|
||||
#if BUILD_RTI
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#endif
|
||||
|
||||
namespace Core
|
||||
{
|
||||
class Pacemaker;
|
||||
@@ -21,11 +23,20 @@ namespace VideoOverlayManagement
|
||||
class DdsHandler final
|
||||
{
|
||||
public:
|
||||
#if BUILD_RTI
|
||||
DdsHandler(int domainId, int exerciseId);
|
||||
#else
|
||||
DdsHandler(int domainId, int exerciseId) { Q_UNUSED(domainId); Q_UNUSED(exerciseId); }
|
||||
#endif
|
||||
~DdsHandler() = default;
|
||||
|
||||
#if BUILD_RTI
|
||||
bool init(const QStringList &qosFileList = QStringList());
|
||||
#else
|
||||
bool init(const QStringList &qosFileList = QStringList()) { Q_UNUSED(qosFileList); return true; }
|
||||
#endif
|
||||
|
||||
#if BUILD_RTI
|
||||
std::shared_ptr<Core::Pacemaker> pacemaker() const
|
||||
{
|
||||
return m_pacemaker;
|
||||
@@ -34,11 +45,17 @@ public:
|
||||
{
|
||||
return m_ddsConnector;
|
||||
}
|
||||
#else
|
||||
std::shared_ptr<Core::Pacemaker> pacemaker() const { return nullptr; }
|
||||
void* dds() const { return nullptr; }
|
||||
#endif
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
#if BUILD_RTI
|
||||
std::shared_ptr<DDSConnector::DdsConnector> m_ddsConnector;
|
||||
std::shared_ptr<Core::Pacemaker> m_pacemaker;
|
||||
#endif
|
||||
};
|
||||
|
||||
} // namespace VideoOverlayManagement
|
||||
Reference in new issue
Block a user