Migration of Legatus codebase to Qt6 with RTI Connext DDS 7.7 integration is partially complete. Core DDS targets build successfully, but ProjectDataManagement module blocks full ddsfts compilation due to IDL definition conflicts.

This commit is contained in:
torsten committed 2026-09-07 19:30:39 +02:00
1 parent 758ae0f53f
commit ba1d9e2c04
256 files changed
+1170 -610

No files matched your search

@@ -48,9 +48,17 @@ ENDIF()
IF(BUILD_RTI)
CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
ENDIF()
# generate ism_[d|f]tc.h
IF(BUILD_RTI)
# Generate ism_[d|f]tc.h
IF(BUILD_GRANTLEE)
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
ELSEIF(BUILD_RTI)
# Use pre-generated files when BUILD_GRANTLEE=OFF
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/ism_dtc.h ${CMAKE_CURRENT_BINARY_DIR}/ism_dtc.h COPYONLY)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/ism_ftc.h ${CMAKE_CURRENT_BINARY_DIR}/ism_ftc.h COPYONLY)
LIST(APPEND SRCS_common
${CMAKE_CURRENT_BINARY_DIR}/ism_dtc.h
${CMAKE_CURRENT_BINARY_DIR}/ism_ftc.h
)
ENDIF()
NGL_ADD_LIBRARY(AAR SV WS HLA svcIsmCommon SHARED ${SRCS_common})
@@ -83,8 +91,16 @@ SET(SRCS_client
parse_building_xml.h
)
# generate ism_[d|f]tc_impl.[cpp|h]
IF(BUILD_RTI)
IF(BUILD_GRANTLEE)
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
ELSEIF(BUILD_RTI)
# Use pre-generated files when BUILD_GRANTLEE=OFF
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/ism_dtc_impl_custom.cpp ${CMAKE_CURRENT_BINARY_DIR}/ism_dtc_impl_custom.cpp COPYONLY)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/ism_dtc_impl_custom.h ${CMAKE_CURRENT_BINARY_DIR}/ism_dtc_impl_custom.h COPYONLY)
LIST(APPEND SRCS_client
${CMAKE_CURRENT_BINARY_DIR}/ism_dtc_impl_custom.cpp
${CMAKE_CURRENT_BINARY_DIR}/ism_dtc_impl_custom.h
)
ENDIF()
NGL_ADD_LIBRARY(AAR SV WS HLA svcIsmClient SHARED ${SRCS_client})