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

@@ -43,6 +43,8 @@ NGL_TARGET_INCLUDE_DIRECTORIES(tabTelegrams
NGL_TARGET_LINK_LIBRARIES(tabTelegrams
PUBLIC
${_QT_CORE_TARGET}
Qt6::Gui
${_QT_NETWORK_TARGET}
)
# install on RPM build and copy for local builds so that LogView automatically finds the training_area_telegrams.h file
@@ -68,13 +70,12 @@ SET(SRCS_common
tab_export.h
)
# Generate tab_enums.idl / tab.idl
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
# Generate tab_db_impl.cpp/.h, tab_db.h
CODEGEN_DATABASE(SRCS_common ${xml_FILE})
# Generate *.cpp/*.hpp from idl (only with BUILD_RTI)
IF(BUILD_RTI)
# Generate tab_enums.idl / tab.idl
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
# Generate tab_db_impl.cpp/.h, tab_db.h
CODEGEN_DATABASE(SRCS_common ${xml_FILE})
# Generate *.cpp/*.hpp from idl (only with BUILD_RTI)
RTIDDSGEN(SRCS_common tab_enums.idl)
RTIDDSGEN(SRCS_common tab.idl)
# Generate tab_dt[s,c]_types.h, tab_ft[s,c]_types.h
@@ -82,10 +83,12 @@ IF(BUILD_RTI)
# generate tab_[d|f]tc.h
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
ELSE()
# Stub files for BUILD_RTI=OFF
SET(SRCS_common ${SRCS_common}
# Stub files for BUILD_RTI=OFF - NO code generation
LIST(APPEND SRCS_common
stubs/tab_enums_stub.hpp
stubs/tab_stub.hpp
stubs/tab_db_stub.hpp
stubs/tab_topic_type_plugin_stub.cpp
)
ENDIF()
@@ -109,7 +112,9 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcTabCommon
NGL_TARGET_LINK_LIBRARIES(svcTabCommon
PUBLIC
Qt6::Core
Qt6::Gui
Qt6::Sql
Qt6::Network
NGLLogger
ngldb
svcPdmCommon
@@ -131,8 +136,11 @@ NGL_INSTALL_TARGET(svcTabCommon)
SET(SRCS_client
tab_export.h
)
# generate tab_[d|f]tc_impl.[cpp|h]
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
IF(BUILD_RTI)
# generate tab_[d|f]tc_impl.[cpp|h]
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
ENDIF()
NGL_ADD_LIBRARY2(AAR SV WS HLA svcTabClient SHARED ${SRCS_client})
NGL_TARGET_INCLUDE_DIRECTORIES(svcTabClient
@@ -160,8 +168,11 @@ SET(SRCS_server
tx_mixin.cpp
tx_mixin.h
)
# generate tab_[d|f]ts.h, tab_[d|f]ts_impl.[cpp|h]
CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
IF(BUILD_RTI)
# generate tab_[d|f]ts.h, tab_[d|f]ts_impl.[cpp|h]
CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
ENDIF()
NGL_ADD_LIBRARY2(AAR HLA SV svcTabServer SHARED ${SRCS_server}) # NGL_ADD_LIBRARY2 won't work here - no time for investigations
if(BUILD_SV OR BUILD_HLA)
@@ -173,27 +184,35 @@ NGL_TARGET_INCLUDE_DIRECTORIES(svcTabServer
${CMAKE_CURRENT_BINARY_DIR}/../
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(svcTabServer
PRIVATE
RTI::nddscpp2
ddsconnector
ddsfts
PUBLIC
svcTabCommon
ngldb
${_QT_CORE_TARGET}
Qt6::Gui
${_QT_NETWORK_TARGET}
)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(svcTabServer
PRIVATE
RTI::nddscpp2
ddsconnector
ddsfts
)
ENDIF(BUILD_RTI)
NGL_INSTALL_TARGET(svcTabServer)
#
# --- Topic Type Plugin --------------------------------------------------------------
#
IF(BUILD_RTI)
CREATE_TOPIC_TYPE_PLUGIN(${xml_FILE})
ENDIF()
#
# --- RecordReplayPlugin --------------------------------------------------------------
#
IF(BUILD_RTI)
CREATE_RECORD_REPLAY_PLUGIN_SHARED(${xml_FILE})
IF (TARGET tabRecordReplayPlugin)
TARGET_SOURCES(tabRecordReplayPlugin
@@ -202,6 +221,7 @@ IF (TARGET tabRecordReplayPlugin)
tab_record_replay_plugin_custom.h
)
ENDIF()
ENDIF()
#
# --- Executable svcTrainingAreaBase (sTAB) -------------------------------------------------
@@ -251,8 +271,10 @@ SET(SRCS_exe
${xml_FILE}
)
# Generate tab.sql, tab.xml
CODEGEN_SQL(SRCS_exe ${xml_FILE})
IF(BUILD_RTI)
# Generate tab.sql, tab.xml
CODEGEN_SQL(SRCS_exe ${xml_FILE})
ENDIF()
NGL_ADD_SVC_ICON(SRCS_exe)
NGL_ADD_EXECUTABLE(AAR SV svcTrainingAreaBase ${SRCS_exe})
@@ -10,7 +10,7 @@ namespace TrainingAreaBase
{
using LOGGER_T = NGL::INGLLogger &;
TAB_COMMON_EXPORT LOGGER_T getLogger(const char *name);
SVCTABCOMMON_EXPORT LOGGER_T getLogger(const char *name);
inline LOGGER_T getLogger(const QString &loggerName)
{
return getLogger(loggerName.toUtf8().constData());
@@ -1,11 +0,0 @@
// Stub for tab_enums.hpp when BUILD_RTI=OFF
#pragma once
namespace TrainingAreaBase {
// Stub enums - replace with actual values as needed
enum class DataModification {
INSERT = 0,
UPDATE = 1,
DELETE = 2
};
}
@@ -1,7 +0,0 @@
// Stub for tab.hpp when BUILD_RTI=OFF
#pragma once
// Forward declarations and stubs for RTI types
namespace TrainingAreaBase {
// Add stub types as needed
}
@@ -67,14 +67,13 @@ public:
bool txData(const TetraIcd::OcCommand &data) override;
bool txData(const TrainingAreaBase::TetraIcd::ExFireReadiness &) override ;
bool txData(const TrainingAreaBase::TetraIcd::ExFiredReport &) override ;
bool txData(const TrainingAreaBase::TetraIcd::ExConfirmationReport &) override ;
private:
NGL::INGLLogger &m_logger;
bool txData(const TrainingAreaBase::TetraIcd::ExConfirmationReport &) override;
bool txData(const TetraIcd::UAVPerformMission &data) override;
bool txData(const TetraIcd::UAVChangeState &data) override;
template<typename T>
bool txDataToAll(const T &data);
private:
NGL::INGLLogger &m_logger;
QVector<std::shared_ptr<SendToTab>> m_txHandler;