Qt6 Migration: Complete migration with DDS/RTI support and build validation
Major Changes:
- Merged latest Qt5 devel content from dlbo (292 files changed, 7 new dirs)
- Consolidated forward-declarations and include folders
- Removed unneeded modules per Niklas' repo check list
Build System Fixes:
- Fixed CMake VERSION_GREATER syntax in ParticipantManagement/CMakeLists.txt
- Added VLC packages (libvlc-dev, vlc-plugin-base) to docker_build.sh
- Added PostgreSQL dev packages (libpq-dev, postgresql-server-dev-all) to Dockerfile
- Fixed locale warnings (ANSI_X3.4-1968 → C.UTF-8)
- Fixed ArcGIS SDK path warnings when BUILD_ARCGIS=OFF
Code Generation Fixes:
- Fixed IDL enum collisions (PortType→CorePortType/DdsutPortType, PdmEventType)
- Fixed Grantlee template svc_translation.cpp.grantlee:
- Changed {{ idl_enum.name }}_def:: to {{ idl_enum.name }}::
- Fixed .underlying() calls for C++11 scoped enums (enum class)
- Removed generated files from repo (moc_*, *_dtc.h, *_ftc.h)
Validation:
- BUILD_RTI=ON: SUCCESS
- BUILD_RTI=OFF: SUCCESS
- C++17 standard maintained for RTI 7.7 compatibility
- Ubuntu 26.04 Docker environment verified
Remaining Warnings (expected):
- BgViewer, KDChart, KDReports, Poppler-Qt6 not found (optional features)
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
18662 files changed
+4115092
-5435
No files matched your search
@@ -0,0 +1,104 @@
|
||||
# -------------------------------------------------------------------------
|
||||
# $HeadURL$
|
||||
# -------------------------------------------------------------------------
|
||||
#!
|
||||
# -------------------------------------------------------------------------
|
||||
# COPYRIGHT (C) 2008: RHEINMETALL DEFENCE ELECTRONICS GmbH, D-28305 BREMEN
|
||||
# -------------------------------------------------------------------------
|
||||
#
|
||||
# HIER/ITEM : CSU: RP 5187 P 0211 SRC 14001
|
||||
# BRIEF DESC: CMake-Findskript
|
||||
# AUTHOR : RDE / SGS
|
||||
# ORIGIN REF: BWB / Projekt GUEZ-HAS
|
||||
#
|
||||
# Revision INFO:
|
||||
# --------------
|
||||
# $Revision$
|
||||
# $Date$
|
||||
# $Id$
|
||||
#
|
||||
# LANGUAGE: -
|
||||
#
|
||||
# PURPOSE:
|
||||
# --------
|
||||
# Suchen der TMSIF-Library und Setzen der folgenden CMake-Variablen:
|
||||
# TMSIF_INCLUDE_DIRS - TMSIF headers location
|
||||
# TMSIF_LIBRARIES - TMSIF libraries
|
||||
# TMSIF_FOUND - TRUE wenn Library gefunden wurde
|
||||
#
|
||||
|
||||
# TMSIF_DIR (from environment)
|
||||
IF(NOT TMSIF_DIR)
|
||||
SET(_arch "unknown")
|
||||
SET(_TMSIF_DIR $ENV{TMSIF_PATH})
|
||||
IF(NOT _TMSIF_DIR)
|
||||
SET(_TMSIF_DIR "/opt/tmsif")
|
||||
ENDIF()
|
||||
IF(NOT EXISTS "${_TMSIF_DIR}" OR NOT IS_DIRECTORY "${_TMSIF_DIR}")
|
||||
MESSAGE(FATAL_ERROR "Umgebungsvariable TMSIF_PATH nicht gesetzt!")
|
||||
ENDIF()
|
||||
SET(TMSIF_DIR "${_TMSIF_DIR}" CACHE STRING "TMSIF base path" FORCE)
|
||||
MESSAGE(STATUS "Trying to use TMSIF_DIR from ${TMSIF_DIR}")
|
||||
ENDIF()
|
||||
SET(_tmsif_include_hint "${TMSIF_DIR}/include/")
|
||||
SET(_tmsif_library_hint "${TMSIF_DIR}/lib/")
|
||||
|
||||
# TMSIF include dir
|
||||
IF(NOT TMSIF_INCLUDE_DIR)
|
||||
FIND_PATH(TMSIF_INCLUDE_DIR Common.h HINTS ${_tmsif_include_hint})
|
||||
IF(TMSIF_INCLUDE_DIR)
|
||||
SET(TMSIF_INCLUDE_DIRS "${TMSIF_INCLUDE_DIR}" "${TMSIF_INCLUDE_DIR}/ddscxx" CACHE STRING "TMSIF include directories" FORCE)
|
||||
MARK_AS_ADVANCED(TMSIF_INCLUDE_DIRS)
|
||||
ELSE()
|
||||
MESSAGE(FATAL "Could not find TMSIF include directory at ${_tmsif_include_hint}")
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
|
||||
# TMSIF libraries
|
||||
SET(_TMSIF_LIBS tmsif-cyclone ddscxx ddkit-cyclone )
|
||||
SET(_libs "")
|
||||
SET(_lib_vars "")
|
||||
|
||||
FOREACH(_lib ${_TMSIF_LIBS})
|
||||
SET(_libname "TMSIF_${_lib}_LIBRARY")
|
||||
IF (NOT ${_libname})
|
||||
FIND_LIBRARY_WITH_DEBUG("${_libname}"
|
||||
WIN32_DEBUG_POSTFIX d
|
||||
NAMES ${_lib}
|
||||
HINTS ${_tmsif_library_hint} ${TMSIF_DIR}/lib )
|
||||
ENDIF()
|
||||
SET(_tgt_name TMSIF::${_lib})
|
||||
|
||||
IF(NOT TARGET ${_tgt_name})
|
||||
ADD_LIBRARY(${_tgt_name} UNKNOWN IMPORTED)
|
||||
SET_PROPERTY(TARGET ${_tgt_name} PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${TMSIF_INCLUDE_DIRS}")
|
||||
SET_PROPERTY(TARGET ${_tgt_name} PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${TMSIF_INCLUDE_DIRS}")
|
||||
|
||||
IF(UNIX)
|
||||
SET_PROPERTY(TARGET ${_tgt_name} PROPERTY INTERFACE_COMPILE_DEFINITIONS "TMSIF_UNIX;TMSIF_LINUX;TMSIF_64BIT" )
|
||||
ENDIF()
|
||||
IF(${_libname}_RELEASE)
|
||||
SET_PROPERTY(TARGET ${_tgt_name} APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
|
||||
SET_PROPERTY(TARGET ${_tgt_name} PROPERTY IMPORTED_LOCATION_RELEASE "${${_libname}_RELEASE}")
|
||||
ENDIF()
|
||||
IF(${_libname}_DEBUG)
|
||||
SET_PROPERTY(TARGET ${_tgt_name} APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
|
||||
SET_PROPERTY(TARGET ${_tgt_name} PROPERTY IMPORTED_LOCATION_DEBUG "${${_libname}_DEBUG}")
|
||||
ENDIF()
|
||||
IF(NOT ${_libname}_RELEASE AND NOT ${_libname}_DEBUG)
|
||||
SET_PROPERTY(TARGET ${_tgt_name} PROPERTY IMPORTED_LOCATION "${${_libname}}")
|
||||
ENDIF()
|
||||
ENDIF()
|
||||
|
||||
LIST(APPEND _libs "${${_libname}}")
|
||||
LIST(APPEND _lib_vars "${_libname}")
|
||||
ENDFOREACH()
|
||||
|
||||
|
||||
SET(TMSIF_LIBRARIES ${_libs} CACHE STRING "All TMSIF libraries" FORCE)
|
||||
MARK_AS_ADVANCED(TMSIF_LIBRARIES)
|
||||
|
||||
INCLUDE(FindPackageHandleStandardArgs)
|
||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(TMSIF DEFAULT_MSG TMSIF_DIR TMSIF_INCLUDE_DIR ${_lib_vars})
|
||||
|
||||
Reference in new issue
Block a user