Files
qt-migration-legatus/qt5-before/dlbo/Lts/Services/ProjectDataManagement/CMakeLists.txt
T
torstenandCopilot 7173785915 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>
2026-09-15 18:20:26 +00:00

167 lines
3.5 KiB
CMake

#
# $Id$
# $HeadURL$
# $Author$
#
INCLUDE(MacroRTIDDSGen)
INCLUDE(MacroCodeGenIdl)
SET(xml_FILE pdm_service.xml)
#
# --- Library svcPdmCommon --------------------------------------------------------------------------------
#
SET(SRCS_common
pdm_export.h
pdm_to_string.cpp
pdm_to_string.h
logger.cpp
logger.h
)
# Generate pdm_enums.idl / pdm.idl
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
# 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 *.cpp/*.hpp from idl
RTIDDSGEN(SRCS_common pdm_enums.idl)
RTIDDSGEN(SRCS_common pdm.idl)
# Generate pdm_dt[s,c]_types.h, pdm_ft[s,c]_types.h
CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
# generate pdm_[d|f]tc.h
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
NGL_ADD_LIBRARY(AAR SV WS HLA svcPdmCommon SHARED ${SRCS_common})
NGL_TARGET_INCLUDE_DIRECTORIES(svcPdmCommon
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../
)
NGL_TARGET_LINK_LIBRARIES(svcPdmCommon
PRIVATE
RTI::nddscpp2
PUBLIC
Qt5::Core
ddscore
NGLLogger
LtsUtilsCore
ngldb
)
NGL_INSTALL_TARGET(svcPdmCommon)
#
# --- Library svcPdmClient --------------------------------------------------------------------------------
#
SET(SRCS_client
pdm_export.h
pdm_dtc_impl_custom.cpp
pdm_dtc_impl_custom.h
)
# generate pdm_ftc_impl.[cpp|h]
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
NGL_ADD_LIBRARY(WS AAR SV HLA svcPdmClient SHARED ${SRCS_client})
NGL_TARGET_INCLUDE_DIRECTORIES(svcPdmClient
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../
)
NGL_TARGET_LINK_LIBRARIES(svcPdmClient
PRIVATE
RTI::nddscpp2
ddsconnector
PUBLIC
svcPdmCommon
ddsftc
)
NGL_INSTALL_TARGET(svcPdmClient)
#
# --- Library svcPdmServer --------------------------------------------------------------------------------
#
SET(SRCS_server
pdm_export.h
)
# generate pdm_[d|f]ts.h, pdm_[d|f]ts_impl.[cpp|h]
CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
NGL_ADD_LIBRARY(WS AAR SV svcPdmServer SHARED ${SRCS_server})
NGL_TARGET_INCLUDE_DIRECTORIES(svcPdmServer
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../
)
NGL_TARGET_LINK_LIBRARIES(svcPdmServer
PRIVATE
RTI::nddscpp2
ddsconnector
ddsfts
PUBLIC
svcPdmCommon
ngldb
)
NGL_INSTALL_TARGET(svcPdmServer)
#
# --- Topic Type Plugin --------------------------------------------------------------
#
CREATE_TOPIC_TYPE_PLUGIN(${xml_FILE})
#
# --- Executable svcProjectDataManagement (sPDM) -------------------------------------------------
#
LIST(APPEND SRCS_exe
convert_db_to_dds.h
dds_handler.cpp
dds_handler.h
main.cpp
main_handler.cpp
main_handler.h
settings.cpp
settings.h
static_data_publisher.h
translation.cpp
translation.h
chargetype_rename.cpp
chargetype_rename.h
static_pvsan_import.cpp
static_pvsan_import.h
${xml_FILE}
)
# Generate pdm.sql, pdm.xml
CODEGEN_SQL(SRCS_exe ${xml_FILE})
NGL_ADD_SVC_ICON(SRCS_exe)
NGL_ADD_EXECUTABLE(AAR SV svcProjectDataManagement ${SRCS_exe})
NGL_TARGET_LINK_LIBRARIES(svcProjectDataManagement
Qt5::Core
svcCoreClient
svcPdmCommon
svcPdmServer
ddsconnector
nglsettings
ProjectConfig
LtsCommandLineParser
LtsWebSocketServer
NGLLogger
nglcoreapplication
ngltools
)
NGL_INSTALL_TARGET(svcProjectDataManagement)
NGL_INSTALL(AAR SV FILES log4cxx_pdm.props DESTINATION bin)
NGL_ADD_TARGET_LINK(svcProjectDataManagement sPDM)
# Uncomment if necessary
#ADD_SUBDIRECTORY(UnitTests)
ADD_SUBDIRECTORY(ModuleTests)