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
@@ -74,7 +74,7 @@ SET(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/include)
|
||||
# Include directory for generated export headers
|
||||
include_directories(${CMAKE_BINARY_DIR})
|
||||
include_directories(${CMAKE_BINARY_DIR}/Z/src/NGLLogger)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/Z/src)
|
||||
# Include directories for external dependencies and internal modules
|
||||
include_directories(${CMAKE_SOURCE_DIR}/Z/src)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/Z/src/ngltools)
|
||||
@@ -100,7 +100,9 @@ SET(CMAKE_CXX_STANDARD 17)
|
||||
SET(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
SET(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
|
||||
SET(CMAKE_CXX_VISIBILITY_PRESET hidden)
|
||||
SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
||||
# Qt6 Migration: Removed CMAKE_POSITION_INDEPENDENT_CODE - Qt6 handles PIC automatically
|
||||
# and this setting conflicts with Qt6's reduce_relocations feature
|
||||
# SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
||||
|
||||
IF(CMAKE_VERSION VERSION_GREATER 3.15.9)
|
||||
OPTION(USE_UNITY_BUILDS "Use Unity builds to speed up compilation (cmake 3.16 or newer required!)" OFF)
|
||||
@@ -347,6 +349,21 @@ if(NOT TARGET Qt6::Multimedia)
|
||||
message(STATUS "Created stub target for Qt6::Multimedia (library not available)")
|
||||
endif()
|
||||
|
||||
# Stub Qt6::Svg target if not available (needed by various plugins)
|
||||
if(NOT TARGET Qt6::Svg)
|
||||
add_library(Qt6::Svg INTERFACE IMPORTED)
|
||||
message(STATUS "Created stub target for Qt6::Svg (library not available)")
|
||||
endif()
|
||||
|
||||
# Stub Qt6::SerialPort target if not available (needed by TrainingAreaBaseOC)
|
||||
if(NOT TARGET Qt6::SerialPort)
|
||||
add_library(Qt6::SerialPort INTERFACE IMPORTED)
|
||||
set_target_properties(Qt6::SerialPort PROPERTIES
|
||||
INTERFACE_COMPILE_DEFINITIONS "QT_NO_SERIALPORT"
|
||||
)
|
||||
message(STATUS "Created stub target for Qt6::SerialPort (library not available)")
|
||||
endif()
|
||||
|
||||
# Stub Qt6::WebEngineCore target if not available (needed by thp_viewer)
|
||||
if(NOT TARGET Qt6::WebEngineCore)
|
||||
add_library(Qt6::WebEngineCore INTERFACE IMPORTED)
|
||||
@@ -420,8 +437,15 @@ IF(BUILD_RTI)
|
||||
IF(DEFINED ENV{DDS_PATH})
|
||||
SET(RTI_INSTALL_DIR "$ENV{DDS_PATH}" CACHE PATH "RTI Connext DDS installation directory")
|
||||
ELSE()
|
||||
# CMAKE_SOURCE_DIR is qt6-migrated-legatus, RTI is at ../../../external/
|
||||
SET(RTI_INSTALL_DIR "${CMAKE_SOURCE_DIR}/../../../external/rti_connext_dds-7.7.0" CACHE PATH "RTI Connext DDS installation directory")
|
||||
# In Docker container: /workspace/external/rti_connext_dds-7.7.0
|
||||
# On host: ${CMAKE_SOURCE_DIR}/../../../external/rti_connext_dds-7.7.0
|
||||
IF(EXISTS "/workspace/external/rti_connext_dds-7.7.0")
|
||||
SET(RTI_INSTALL_DIR "/workspace/external/rti_connext_dds-7.7.0" CACHE PATH "RTI Connext DDS installation directory")
|
||||
ELSEIF(EXISTS "${CMAKE_SOURCE_DIR}/../../../external/rti_connext_dds-7.7.0")
|
||||
SET(RTI_INSTALL_DIR "${CMAKE_SOURCE_DIR}/../../../external/rti_connext_dds-7.7.0" CACHE PATH "RTI Connext DDS installation directory")
|
||||
ELSE()
|
||||
SET(RTI_INSTALL_DIR "/opt/RTI" CACHE PATH "RTI Connext DDS installation directory")
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
# Also set RTI_DIR for FindRTI.cmake compatibility (used by subdirectories)
|
||||
SET(RTI_DIR "${RTI_INSTALL_DIR}" CACHE PATH "RTI base path" FORCE)
|
||||
|
||||
Reference in new issue
Block a user