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

@@ -4,8 +4,6 @@
# $Author$
#
IF(BUILD_RTI)
INCLUDE(MacroRTIDDSGen)
INCLUDE(MacroCodeGenIdl)
@@ -22,43 +20,75 @@ SET(SRCS_common
logger.h
)
# Generate pdm_enums.idl / pdm.idl
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
IF(BUILD_RTI)
# Generate pdm_enums.idl / pdm.idl
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
# Generate pdm_db.h
CODEGEN_DATABASE_STRUCTS(SRCS_common ${xml_FILE})
# Generate pdm_db_impl.cpp/.h,
CODEGEN_DATABASE_SQL(SRCS_common ${xml_FILE})
# Generate pdm_db.h
CODEGEN_DATABASE_STRUCTS(SRCS_common ${xml_FILE})
# Generate pdm_db_impl.cpp/.h,
CODEGEN_DATABASE_SQL(SRCS_common ${xml_FILE})
# Generate *.cpp/*.hpp from idl
RTIDDSGEN(SRCS_common pdm_enums.idl)
RTIDDSGEN(SRCS_common pdm.idl)
# Generate *.cpp/*.hpp from idl
RTIDDSGEN(SRCS_common pdm_enums.idl)
RTIDDSGEN(SRCS_common pdm.idl)
# Generate pdm_dt[s,c]_types.h, pdm_ft[s,c]_types.h
CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
# generate pdm_[d|f]tc.h
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
# Generate pdm_dt[s,c]_types.h, pdm_ft[s,c]_types.h
CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
# generate pdm_[d|f]tc.h
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
ELSE()
# Stub files for BUILD_RTI=OFF - NO code generation
LIST(APPEND SRCS_common
stubs/pdm_enums_stub.hpp
stubs/pdm_stub.hpp
stubs/pdm_db_stub.hpp
)
ENDIF()
# Create target only if component flags allow
NGL_ADD_LIBRARY2(AAR SV WS HLA svcPdmCommon SHARED ${SRCS_common})
NGL_TARGET_INCLUDE_DIRECTORIES(svcPdmCommon
# Generate export header ALWAYS (needed even if target not built)
IF(NOT TARGET svcPdmCommon)
# Create a dummy static library just for export header generation
ADD_LIBRARY(svcPdmCommon STATIC ${SRCS_common})
ENDIF()
# Generate export header BEFORE setting include directories
GENERATE_EXPORT_HEADER(svcPdmCommon EXPORT_FILE_NAME "svcpdmcommon_export.h")
# Include directories for svcPdmCommon (must include build dir for export header)
IF(TARGET svcPdmCommon)
TARGET_INCLUDE_DIRECTORIES(svcPdmCommon
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/include/ProjectDataManagement
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../
${CMAKE_CURRENT_SOURCE_DIR}/stubs
${CMAKE_CURRENT_BINARY_DIR}/stubs
)
ENDIF()
NGL_TARGET_LINK_LIBRARIES(svcPdmCommon
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../
Qt6::Core
NGLLogger
LtsUtilsCore
ngldb
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(svcPdmCommon
PRIVATE
RTI::nddscpp2
PUBLIC
Qt6::Core
ddscore
NGLLogger
LtsUtilsCore
ngldb
)
ENDIF(BUILD_RTI)
NGL_INSTALL_TARGET(svcPdmCommon)
IF(BUILD_RTI)
#
# --- Library svcPdmClient --------------------------------------------------------------------------------
#
@@ -9,13 +9,14 @@
#pragma once
#include <NGLLogger/INGLLogger.h>
#include <QString>
#include "svcpdmcommon_export.h"
namespace ProjectDataManagement
{
using LOGGER_T = NGL::INGLLogger &;
PDM_COMMON_EXPORT LOGGER_T getLogger(const char *name);
SVCPDMCOMMON_EXPORT LOGGER_T getLogger(const char *name);
inline LOGGER_T getLogger(const QString &loggerName)
{
return getLogger(loggerName.toUtf8().constData());
@@ -13,6 +13,10 @@
namespace ProjectDataManagement
{
// Forward declaration for helper function
static QString toString(VulnerabilityState vs);
//
// VulnerabilityState + VulnerabilityClass
//
@@ -97,7 +101,6 @@ static QString toStringSoldier(VulnerabilityState vs)
case 14:
case 15:
case 16:
case 4:
case 6:
case 0:
case 17: