LtsSession: STUB-Unterstützung und Build-Fixes
- lts_session_data_dds.h/cpp: BUILD_RTI guards für STUB/Real-Implementation - Include-Pfad fix: DDS/QosProfile/DDS_DefaultQos (ohne .h) - CMakeLists.txt: qtservice_export.h Includer Pfad korrigiert - AdvancedSymbology/Data: Qt6 Core5Compat Verlinkung RTI License: ~/swy/sandbox/rti_license.dat (leer, vom Installer) ArcGIS SDK: ./external/ArcGIS/MapsSDK_Qt_300.0.0/ Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
6 files changed
+253
-69
No files matched your search
@@ -8,26 +8,53 @@
|
||||
# RTI Connext DDS - uses IMPORTED targets from parent CMakeLists.txt
|
||||
OPTION(BUILD_RTI "Build with RTI Connext DDS support" ON)
|
||||
|
||||
# LtsSessionDataDds (only with RTI)
|
||||
# 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 (always built, with stub implementation for non-RTI builds)
|
||||
SET(LtsSessionDataDds_SRCS
|
||||
lts_session_data_dds.cpp
|
||||
lts_session_data_dds.h
|
||||
)
|
||||
NGL_ADD_LIBRARY2(WS LtsSessionDataDds SHARED ${LtsSessionDataDds_SRCS})
|
||||
set_target_properties(LtsSessionDataDds PROPERTIES AUTOMOC ON)
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(LtsSessionDataDds
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsSessionDataDds
|
||||
PRIVATE
|
||||
$<$<BOOL:${BUILD_RTI}>:ddsconnector>
|
||||
PUBLIC
|
||||
$<$<BOOL:${BUILD_RTI}>:nddscore>
|
||||
NGLLogger
|
||||
Qt6::Core
|
||||
)
|
||||
IF(BUILD_RTI)
|
||||
SET(LtsSessionDataDds_SRCS
|
||||
lts_session_data_dds.cpp
|
||||
lts_session_data_dds.h
|
||||
)
|
||||
NGL_ADD_LIBRARY2(WS LtsSessionDataDds SHARED ${LtsSessionDataDds_SRCS})
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(LtsSessionDataDds
|
||||
PUBLIC
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
${RTI_INCLUDE_DIR}
|
||||
)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsSessionDataDds
|
||||
NGL_TARGET_LINK_DIRECTORIES(LtsSessionDataDds
|
||||
PRIVATE
|
||||
ddsconnector
|
||||
PUBLIC
|
||||
RTI::nddscore
|
||||
NGLLogger
|
||||
Qt6::Core
|
||||
${RTI_LIB_DIR}
|
||||
)
|
||||
ENDIF()
|
||||
IF(BUILD_RTI)
|
||||
TARGET_COMPILE_DEFINITIONS(LtsSessionDataDds PUBLIC BUILD_RTI)
|
||||
ENDIF()
|
||||
|
||||
@@ -80,14 +107,14 @@ NGL_TARGET_LINK_LIBRARIES(LtsSession
|
||||
DataPluginInterface
|
||||
NGLLogger
|
||||
ProjectConfig
|
||||
LtsSessionDataDds # Always link, even in stub mode
|
||||
)
|
||||
IF(BUILD_RTI)
|
||||
NGL_TARGET_LINK_LIBRARIES(LtsSession
|
||||
PRIVATE
|
||||
ddsconnector
|
||||
PUBLIC
|
||||
LtsSessionDataDds
|
||||
RTI::nddscore
|
||||
nddscore
|
||||
)
|
||||
TARGET_COMPILE_DEFINITIONS(LtsSession PUBLIC BUILD_RTI)
|
||||
ENDIF()
|
||||
|
||||
Reference in new issue
Block a user