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

@@ -20,15 +20,81 @@ SET(SRCS_common
logger.h
)
# Copy pdm_types.h.stub to pdm_types.h in build directory
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/../../../include/ProjectDataManagement/pdm_types.h.stub
${CMAKE_CURRENT_BINARY_DIR}/pdm_types.h
COPYONLY
)
# Copy pdm_translation.h.stub to pdm_translation.h in build directory
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/../../../include/ProjectDataManagement/pdm_translation.h.stub
${CMAKE_CURRENT_BINARY_DIR}/pdm_translation.h
COPYONLY
)
# Copy pdm_enums.hpp.stub to pdm_enums.hpp in build directory (when BUILD_RTI=OFF)
IF(NOT BUILD_RTI)
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/../../../include/ProjectDataManagement/pdm_enums.hpp.stub
${CMAKE_CURRENT_BINARY_DIR}/pdm_enums.hpp
COPYONLY
)
ENDIF()
# Add current binary dir to include path for generated headers
NGL_TARGET_INCLUDE_DIRECTORIES(${PDM_COMMON_TARGET}
PUBLIC
${CMAKE_CURRENT_BINARY_DIR}
)
# Generate pdm_enums.idl / pdm.idl
IF(BUILD_RTI)
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
ENDIF()
# Generate pdm_db.h
CODEGEN_DATABASE_STRUCTS(SRCS_common ${xml_FILE})
# Generate pdm_db_impl.cpp/.h,
CODEGEN_DATABASE_SQL(SRCS_common ${xml_FILE})
# Generate pdm_db.h and pdm_db_impl - requires Grantlee
IF(BUILD_GRANTLEE)
# Generate pdm_db.h
CODEGEN_DATABASE_STRUCTS(SRCS_common ${xml_FILE})
# Generate pdm_db_impl.cpp/.h,
CODEGEN_DATABASE_SQL(SRCS_common ${xml_FILE})
ELSE()
# Use pre-generated stub files when BUILD_GRANTLEE=OFF
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/pdm_db_structs.h.stub
${CMAKE_CURRENT_BINARY_DIR}/pdm_db_structs.h
COPYONLY
)
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/pdm_db_structs.cpp.stub
${CMAKE_CURRENT_BINARY_DIR}/pdm_db_structs.cpp
COPYONLY
)
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/pdm_db.h.stub
${CMAKE_CURRENT_BINARY_DIR}/pdm_db.h
COPYONLY
)
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/pdm_db_impl.h.stub
${CMAKE_CURRENT_BINARY_DIR}/pdm_db_impl.h
COPYONLY
)
CONFIGURE_FILE(
${CMAKE_CURRENT_SOURCE_DIR}/pdm_db_impl.cpp.stub
${CMAKE_CURRENT_BINARY_DIR}/pdm_db_impl.cpp
COPYONLY
)
LIST(APPEND SRCS_common
${CMAKE_CURRENT_BINARY_DIR}/pdm_db_structs.h
${CMAKE_CURRENT_BINARY_DIR}/pdm_db_structs.cpp
${CMAKE_CURRENT_BINARY_DIR}/pdm_db.h
${CMAKE_CURRENT_BINARY_DIR}/pdm_db_impl.h
${CMAKE_CURRENT_BINARY_DIR}/pdm_db_impl.cpp
)
ENDIF()
# Generate *.cpp/*.hpp from idl
IF(BUILD_RTI)
@@ -45,47 +111,28 @@ IF(BUILD_RTI)
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
ENDIF()
# Check if svcPdmCommon target exists
IF(TARGET svcPdmCommon)
SET(PDM_COMMON_TARGET svcPdmCommon)
ELSE()
SET(PDM_COMMON_TARGET "")
ENDIF()
IF(PDM_COMMON_TARGET)
NGL_ADD_LIBRARY(AAR SV WS HLA ${PDM_COMMON_TARGET} SHARED ${SRCS_common})
NGL_TARGET_INCLUDE_DIRECTORIES(${PDM_COMMON_TARGET}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../
)
NGL_TARGET_LINK_LIBRARIES(${PDM_COMMON_TARGET}
PRIVATE
RTI::nddscpp2
PUBLIC
Qt6::Core
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
NGLLogger
LtsUtilsCore
ngldb
)
NGL_INSTALL_TARGET(${PDM_COMMON_TARGET})
ELSE()
# Create a dummy interface library if svcPdmCommon doesn't exist
ADD_LIBRARY(svcPdmCommon INTERFACE)
TARGET_INCLUDE_DIRECTORIES(svcPdmCommon
INTERFACE
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../
)
TARGET_LINK_LIBRARIES(svcPdmCommon
INTERFACE
Qt6::Core
NGLLogger
LtsUtilsCore
ngldb
)
ENDIF()
# Create svcPdmCommon library with common sources
SET(PDM_COMMON_TARGET svcPdmCommon)
NGL_ADD_LIBRARY(AAR SV WS HLA ${PDM_COMMON_TARGET} SHARED ${SRCS_common})
generate_export_header(${PDM_COMMON_TARGET}
EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/svcpdmcommon_export.h"
)
NGL_TARGET_INCLUDE_DIRECTORIES(${PDM_COMMON_TARGET}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../
)
NGL_TARGET_LINK_LIBRARIES(${PDM_COMMON_TARGET}
PRIVATE
RTI::nddscpp2
PUBLIC
Qt6::Core
$<IF:$<TARGET_EXISTS:ddscore>,ddscore,>
NGLLogger
LtsUtilsCore
ngldb
)
NGL_INSTALL_TARGET(${PDM_COMMON_TARGET})
#
# --- Library svcPdmClient --------------------------------------------------------------------------------