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
@@ -18,25 +18,43 @@ SET(SRCS_common
|
||||
)
|
||||
|
||||
# Generate alm_enums.idl / alm.idl
|
||||
IF(BUILD_RTI)
|
||||
IF(BUILD_RTI AND BUILD_GRANTLEE)
|
||||
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
|
||||
ELSEIF(BUILD_RTI AND NOT BUILD_GRANTLEE)
|
||||
# BUILD_GRANTLEE disabled: check for pre-generated files
|
||||
IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/alm.idl" AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/alm_enums.idl")
|
||||
MESSAGE(STATUS "BUILD_GRANTLEE disabled: using pre-generated IDL files for alm")
|
||||
LIST(APPEND SRCS_common alm.idl alm_enums.idl)
|
||||
ELSE()
|
||||
MESSAGE(WARNING "BUILD_GRANTLEE disabled but no pre-generated IDL files found for alm. Skipping service.")
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
# Generate alm_db_impl.cpp/.h, alm_db.h
|
||||
IF(BUILD_RTI)
|
||||
IF(BUILD_RTI AND BUILD_GRANTLEE)
|
||||
CODEGEN_DATABASE(SRCS_common ${xml_FILE})
|
||||
ENDIF()
|
||||
|
||||
# Generate *.cpp/*.hpp from idl
|
||||
IF(BUILD_RTI AND (BUILD_GRANTLEE OR (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/alm.idl" AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/alm_enums.idl")))
|
||||
RTIDDSGEN(SRCS_common alm_enums.idl)
|
||||
RTIDDSGEN(SRCS_common alm.idl)
|
||||
ENDIF()
|
||||
|
||||
# Generate alm_dt[s,c]_types.h, alm_ft[s,c]_types.h
|
||||
IF(BUILD_RTI)
|
||||
IF(BUILD_RTI AND BUILD_GRANTLEE)
|
||||
CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
|
||||
ENDIF()
|
||||
# Generate alm_[d|f]tc.h
|
||||
IF(BUILD_RTI)
|
||||
IF(BUILD_RTI AND BUILD_GRANTLEE)
|
||||
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
|
||||
ELSEIF(BUILD_RTI AND NOT BUILD_GRANTLEE)
|
||||
# Check for pre-generated files
|
||||
IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/alm_dtc.h" AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/alm_ftc.h")
|
||||
MESSAGE(STATUS "BUILD_GRANTLEE disabled: using pre-generated DTC/FTC files for alm")
|
||||
LIST(APPEND SRCS_common alm_dtc.h alm_ftc.h)
|
||||
ELSE()
|
||||
MESSAGE(WARNING "BUILD_GRANTLEE disabled but no pre-generated DTC/FTC files found for alm")
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
NGL_ADD_LIBRARY(AAR SV WS svcAlmCommon SHARED ${SRCS_common})
|
||||
@@ -64,8 +82,16 @@ SET(SRCS_client
|
||||
alm_export.h
|
||||
)
|
||||
# generate alm_[d|f]tc.h, tlm_[d|f]tc_impl.[cpp|h]
|
||||
IF(BUILD_RTI)
|
||||
IF(BUILD_RTI AND BUILD_GRANTLEE)
|
||||
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
|
||||
ELSEIF(BUILD_RTI AND NOT BUILD_GRANTLEE)
|
||||
# Check for pre-generated files
|
||||
IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/alm_dtc.h" AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/alm_ftc.h")
|
||||
MESSAGE(STATUS "BUILD_GRANTLEE disabled: using pre-generated DTC/FTC files for alm client")
|
||||
LIST(APPEND SRCS_client alm_dtc.h alm_ftc.h)
|
||||
ELSE()
|
||||
MESSAGE(WARNING "BUILD_GRANTLEE disabled but no pre-generated DTC/FTC files found for alm client")
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
NGL_ADD_LIBRARY(AAR SV WS svcAlmClient SHARED ${SRCS_client})
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
#pragma once
|
||||
|
||||
#include <DDS/DDSConnector/dds_connector.h>
|
||||
#include <DDS/Core/core_dtc.h>
|
||||
#include <DDS/Core/topic_lock_master.h>
|
||||
#include <Core/core_dtc.h>
|
||||
#include <Core/topic_lock_master.h>
|
||||
#include <AlarmManagement/alm_dts.h>
|
||||
#include <AlarmManagement/alm_dtc.h>
|
||||
#include <AlarmManagement/alm_fts.h>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <dds_handler.h>
|
||||
#include "logger.h"
|
||||
|
||||
#include <DDS/Core/function_reply_object.h>
|
||||
#include <Core/function_reply_object.h>
|
||||
//Generated
|
||||
#include <AlarmManagement/alm_db.h>
|
||||
|
||||
|
||||
Reference in new issue
Block a user