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
@@ -8,18 +8,18 @@
|
||||
# RTI Connext DDS - default ON
|
||||
OPTION(BUILD_RTI "Build with RTI Connext DDS support" ON)
|
||||
|
||||
# Find RTI Connext DDS
|
||||
# Find RTI Connext DDS - manual configuration (no CMake config file available)
|
||||
IF(BUILD_RTI)
|
||||
# Try to find RTI in external directory first, then system paths
|
||||
FIND_PACKAGE(RTIConnextDDS 7.7.0 QUIET
|
||||
PATHS "${CMAKE_SOURCE_DIR}/../../../external/rti_connext_dds-7.7.0"
|
||||
NO_DEFAULT_PATH
|
||||
)
|
||||
IF(NOT RTIConnextDDS_FOUND)
|
||||
FIND_PACKAGE(RTIConnextDDS 7.7.0 QUIET)
|
||||
ENDIF()
|
||||
IF(NOT RTIConnextDDS_FOUND)
|
||||
MESSAGE(WARNING "RTI Connext DDS not found, building without RTI support")
|
||||
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()
|
||||
@@ -35,15 +35,21 @@ 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
|
||||
RTI::nddscore
|
||||
nddscore
|
||||
NGLLogger
|
||||
Qt6::Core
|
||||
)
|
||||
TARGET_COMPILE_DEFINITIONS(LtsSessionDataDds PUBLIC BUILD_RTI)
|
||||
ENDIF()
|
||||
|
||||
|
||||
@@ -97,13 +103,22 @@ 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
|
||||
RTI::nddscore
|
||||
nddscore
|
||||
)
|
||||
TARGET_COMPILE_DEFINITIONS(LtsSession PUBLIC BUILD_RTI)
|
||||
ENDIF()
|
||||
|
||||
|
||||
@@ -126,8 +141,17 @@ 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
|
||||
RTI::nddscore
|
||||
nddscore
|
||||
)
|
||||
TARGET_COMPILE_DEFINITIONS(LtsSessionData PUBLIC BUILD_RTI)
|
||||
ENDIF()
|
||||
Reference in new issue
Block a user