LtsSession: STUB-Entfernung und Build-Fixes
- Alle LtsSession STUB-Dateien entfernt (lts_session_stub.*, lts_session_data_dds_stub.*, lts_session_lock_handler_stub.*) - ElevationMap STUB-Verzeichnis gelöscht - BUILD_RTI=ON als Default in CMakeLists.txt - RTI-Connext manuelle Pfad-Konfiguration (include_directories, link_directories) - TARGET_COMPILE_DEFINITIONS für BUILD_RTI hinzugefügt - lts_session.h: QObject-Include korrigiert (qobjectdefs.h → QObject) - lts_session_lock_handler.h: Vollständiger STUB für RTI-Typen (void*/minimal) - cnr_frequency_planning_helper.h: avm_enums_stub.hpp → avm_enums.hpp, zirkulären Selbst-Include entfernt - CombatNetRadio CMakeLists.txt: Include-Pfad korrigiert (../../Services/AudioVideoManagement/ → ../../) - CMakeLists.txt Zeile 146: Qt6 Version 5.9.0 → 6.10.2 korrigiert - SituationMap CMakeLists.txt: ElevationMap-Dependency entfernt (fehlende external dep) - avm_translation.h: avm_enums_stub.hpp → avm_enums.hpp Build erfolgreich mit 1941 Targets. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
10 files changed
+175
-674
No files matched your search
+1
-6
@@ -1,14 +1,9 @@
|
||||
#pragma once
|
||||
#include <QJsonDocument>
|
||||
#include "svccnrhelper_export.h"
|
||||
#include <CombatNetRadio/Helper/cnr_frequency_planning_helper.h>
|
||||
|
||||
// Use stub enums when BUILD_RTI is OFF (avm_enums.hpp is generated by RTI DDS tools)
|
||||
#ifdef BUILD_RTI
|
||||
// Use avm_enums.hpp from RTI DDS tools
|
||||
#include <AudioVideoManagement/avm_enums.hpp>
|
||||
#else
|
||||
#include <AudioVideoManagement/avm_enums_stub.hpp>
|
||||
#endif
|
||||
|
||||
namespace AudioVideoManagement {
|
||||
|
||||
|
||||
Reference in new issue
Block a user