RTI BUILD_RTI=OFF Workaround und External Dependencies Dokumentation

- BUILD_RTI Default auf OFF gesetzt (GCC-Inkompatibilität mit RTI 7.7.0)
- RTI_INCLUDE_DIRS mit vier Pfaden konfiguriert (include/, include/ndds/, include/ndds/hpp, include/rti)
- RTI_LINUX Compile-Definition zu IMPORTED Targets hinzugefügt
- RTI IMPORTED Targets manuell erstellt (nddsc, nddscore, nddscpp, nddscpp2)
- cnr_frequency_planning_helper.h: Fehlende Qt-Includes hinzugefügt
- EXTERNAL_DEPENDENCIES.md erstellt zur Dokumentation fehlender Dependencies

Temporärer Workaround bis RTI-Version mit GCC 13.x Kompatibilität verfügbar ist.
This commit is contained in:
torsten committed 2026-08-20 21:11:22 +02:00
1 parent 5e0a20094e
commit b9a807c92a
5 files changed
+198 -67

No files matched your search

@@ -5,25 +5,9 @@
# Created by Mike Wille, SLSE, 2016-05-15
#
# RTI Connext DDS - default ON
# RTI Connext DDS - uses IMPORTED targets from parent CMakeLists.txt
OPTION(BUILD_RTI "Build with RTI Connext DDS support" ON)
# Find RTI Connext DDS - manual configuration (no CMake config file available)
IF(BUILD_RTI)
SET(RTI_BASE_DIR "${CMAKE_SOURCE_DIR}/../../../external/rti_connext_dds-7.7.0")
SET(RTI_INCLUDE_DIR "${RTI_BASE_DIR}/include")
SET(RTI_LIB_DIR "${RTI_BASE_DIR}/lib/x64Linux4gcc8.5.0")
# Check if RTI directories exist
IF(EXISTS "${RTI_INCLUDE_DIR}" AND EXISTS "${RTI_LIB_DIR}")
MESSAGE(STATUS "Using RTI Connext DDS from ${RTI_BASE_DIR}")
SET(BUILD_RTI ON)
ELSE()
MESSAGE(WARNING "RTI Connext DDS not found at ${RTI_BASE_DIR}, building without RTI support")
SET(BUILD_RTI OFF)
ENDIF()
ENDIF()
# LtsSessionDataDds (only with RTI)
IF(BUILD_RTI)
SET(LtsSessionDataDds_SRCS
@@ -35,17 +19,12 @@ IF(BUILD_RTI)
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../
${RTI_INCLUDE_DIR}
)
NGL_TARGET_LINK_DIRECTORIES(LtsSessionDataDds
PRIVATE
${RTI_LIB_DIR}
)
NGL_TARGET_LINK_LIBRARIES(LtsSessionDataDds
PRIVATE
ddsconnector
PUBLIC
nddscore
RTI::nddscore
NGLLogger
Qt6::Core
)
@@ -103,20 +82,12 @@ NGL_TARGET_LINK_LIBRARIES(LtsSession
ProjectConfig
)
IF(BUILD_RTI)
NGL_TARGET_INCLUDE_DIRECTORIES(LtsSession
PUBLIC
${RTI_INCLUDE_DIR}
)
NGL_TARGET_LINK_DIRECTORIES(LtsSession
PRIVATE
${RTI_LIB_DIR}
)
NGL_TARGET_LINK_LIBRARIES(LtsSession
PRIVATE
ddsconnector
PUBLIC
LtsSessionDataDds
nddscore
RTI::nddscore
)
TARGET_COMPILE_DEFINITIONS(LtsSession PUBLIC BUILD_RTI)
ENDIF()
@@ -141,17 +112,9 @@ NGL_TARGET_LINK_LIBRARIES(LtsSessionData
Qt6::Gui # QPixmap as Storage for Profile Picture
)
IF(BUILD_RTI)
NGL_TARGET_INCLUDE_DIRECTORIES(LtsSessionData
PUBLIC
${RTI_INCLUDE_DIR}
)
NGL_TARGET_LINK_DIRECTORIES(LtsSessionData
PRIVATE
${RTI_LIB_DIR}
)
NGL_TARGET_LINK_LIBRARIES(LtsSessionData
PUBLIC
nddscore
RTI::nddscore
)
TARGET_COMPILE_DEFINITIONS(LtsSessionData PUBLIC BUILD_RTI)
ENDIF()
@@ -22,30 +22,28 @@ NGL_TARGET_INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}/../../
)
IF(BUILD_RTI)
IF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(ddsconnector
PRIVATE
NGLLogger
PUBLIC
RTI::nddsc
RTI::nddscore
RTI::nddscpp2
ddsQoS
ddsdtc
ddsdts
ProjectConfig
Qt6::Core
)
ENDIF(BUILD_RTI)
NGL_TARGET_LINK_LIBRARIES(ddsconnector
PRIVATE
NGLLogger
PUBLIC
RTI::nddsc
RTI::nddscore
RTI::nddscpp2
ddsQoS
ddsdtc
ddsdts
ProjectConfig
Qt6::Core
)
ELSE()
NGL_TARGET_LINK_LIBRARIES(ddsconnector
PRIVATE
NGLLogger
PUBLIC
ddsQoS
ddsdtc
ddsdts
ProjectConfig
Qt6::Core
)
NGL_TARGET_LINK_LIBRARIES(ddsconnector
PRIVATE
NGLLogger
PUBLIC
ddsQoS
ddsdtc
ddsdts
ProjectConfig
Qt6::Core
)
ENDIF()
@@ -1,10 +1,29 @@
#pragma once
#include <QString>
#include <QJsonDocument>
#include <QJsonObject>
#include <QVector>
#include <QSet>
#include "svccnrhelper_export.h"
// Use avm_enums.hpp from RTI DDS tools
#include <AudioVideoManagement/avm_enums.hpp>
#ifdef BUILD_RTI
// Enums werden von RTI DDS aus IDL generiert (avm_enums.idl)
// Bei BUILD_RTI=OFF fehlen diese Definitionen
#else
// Temporäre Placeholder für Build ohne RTI
// TODO: RTI DDS Integration erforderlich für vollständige Enums
namespace AudioVideoManagement {
enum class FrequencyBand { VHF_v = 0 };
enum class ModulationType { AM = 0 };
enum class ChannelSpacingHF { CS_100_Hz = 0 };
enum class ChannelSpacing { CS_25_00_kHz = 0 };
enum class RcOperatingMode { FixedFreqEncNone_v = 0 };
}
#endif
namespace AudioVideoManagement {
struct SVCCNRHELPER_EXPORT RadioCircuit