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
+11
-1
@@ -6,7 +6,9 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#if BUILD_RTI
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#endif
|
||||
#include <ngldb/db_service_handler.h>
|
||||
#include "svcgmpserver_export.h"
|
||||
#include "logger.h"
|
||||
@@ -14,7 +16,9 @@
|
||||
namespace GuezMinelayerProcessing
|
||||
{
|
||||
class DdsHandler;
|
||||
#if BUILD_RTI
|
||||
class HandlerMinelayerData;
|
||||
#endif
|
||||
|
||||
class GMP_SERVER_EXPORT Initialization final
|
||||
{
|
||||
@@ -22,12 +26,18 @@ public:
|
||||
Initialization();
|
||||
~Initialization();
|
||||
|
||||
bool initialize(const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector);
|
||||
bool initialize(
|
||||
#if BUILD_RTI
|
||||
const std::shared_ptr<DDSConnector::DdsConnector> &ddsConnector
|
||||
#endif
|
||||
);
|
||||
bool loadFromDatabase();
|
||||
|
||||
private:
|
||||
NGL::INGLLogger &m_logger;
|
||||
std::shared_ptr<DdsHandler> m_ddsHandler;
|
||||
#if BUILD_RTI
|
||||
std::shared_ptr<HandlerMinelayerData> m_handlerMinelayerData;
|
||||
#endif
|
||||
};
|
||||
} // namespace GuezMinelayerProcessing
|
||||
Reference in new issue
Block a user