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:
256 files changed
+1170
-610
No files matched your search
@@ -38,10 +38,24 @@ CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
|
||||
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
|
||||
|
||||
# Get the generated core_dtc.h path for manual MOC handling
|
||||
SET(CORE_DTC_H_GENERATED "${CMAKE_CURRENT_BINARY_DIR}/core_dtc.h")
|
||||
# When BUILD_GRANTLEE=OFF, file is in source dir; otherwise in build dir
|
||||
IF(BUILD_GRANTLEE)
|
||||
SET(CORE_DTC_H_GENERATED "${CMAKE_CURRENT_BINARY_DIR}/core_dtc.h")
|
||||
ELSE()
|
||||
SET(CORE_DTC_H_GENERATED "${CMAKE_CURRENT_SOURCE_DIR}/core_dtc.h")
|
||||
# Copy to build directory for consistent MOC handling
|
||||
CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/core_dtc.h" "${CMAKE_CURRENT_BINARY_DIR}/core_dtc.h" COPYONLY)
|
||||
ENDIF()
|
||||
|
||||
NGL_ADD_LIBRARY2(WS AAR HLA SV ddscore SHARED ${SRCS_common})
|
||||
|
||||
# Add RTI compile definitions explicitly (required for RTI headers to compile)
|
||||
TARGET_COMPILE_DEFINITIONS(ddscore PRIVATE
|
||||
RTI_UNIX
|
||||
RTI_LINUX
|
||||
RTI_64BIT
|
||||
)
|
||||
|
||||
# Skip AUTOMOC for generated header - it will be processed manually with correct dependencies
|
||||
SET_SOURCE_FILES_PROPERTIES(${CORE_DTC_H_GENERATED} PROPERTIES SKIP_AUTOMOC ON)
|
||||
|
||||
|
||||
Reference in new issue
Block a user