Files
qt-migration-legatus/qt5-before/dlbo/Lts/Services/InfrastructureManagement/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

213 lines
4.8 KiB
CMake

#
# $Id$
# $HeadURL$
# $Author$
#
INCLUDE(MacroRTIDDSGen)
INCLUDE(MacroCodeGenIdl)
SET(xml_FILE ism_service.xml)
#
# --- Library svcIsmCommon --------------------------------------------------------------------------------
#
SET(SRCS_common
ism_export.h
ism_db_impl_custom.cpp
ism_db_impl_custom.h
logger.cpp
logger.h
)
# Generate ism_enums.idl / ism.idl
CODEGEN_IDL_SVC(SRCS_common ${xml_FILE})
# Generate ism_db_impl.cpp/.h, ism_db.h
CODEGEN_DATABASE(SRCS_common ${xml_FILE})
# Generate *.cpp/*.hpp from idl
RTIDDSGEN(SRCS_common ism_enums.idl)
RTIDDSGEN(SRCS_common ism.idl)
# Generate ism_dt[s,c]_types.h, ism_ft[s,c]_types.h
CODEGEN_TOPIC_TYPEDEFS(SRCS_common ${xml_FILE})
# generate ism_[d|f]tc.h
CODEGEN_CLIENT_TOPICS_IFC(SRCS_common ${xml_FILE})
NGL_ADD_LIBRARY(AAR SV WS HLA svcIsmCommon SHARED ${SRCS_common})
NGL_TARGET_INCLUDE_DIRECTORIES(svcIsmCommon
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../
)
NGL_TARGET_LINK_LIBRARIES(svcIsmCommon
PRIVATE
RTI::nddscpp2
PUBLIC
Qt5::Core
ddscore
LtsUtilsCore
ngldb
NGLLogger
)
NGL_INSTALL_TARGET(svcIsmCommon)
#
# --- Library svcIsmClient --------------------------------------------------------------------------------
#
SET(SRCS_client
ism_export.h
ism_dtc_impl_custom.cpp
ism_dtc_impl_custom.h
parse_building_xml.cpp
parse_building_xml.h
)
# generate ism_[d|f]tc_impl.[cpp|h]
CODEGEN_CLIENT_TOPICS_IMPL(SRCS_client ${xml_FILE})
NGL_ADD_LIBRARY(AAR SV WS HLA svcIsmClient SHARED ${SRCS_client})
NGL_TARGET_INCLUDE_DIRECTORIES(svcIsmClient
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../
)
NGL_TARGET_LINK_LIBRARIES(svcIsmClient
PRIVATE
RTI::nddscpp2
ddsconnector
Qt5::Xml
PUBLIC
svcIsmCommon
ddsftc
LtsCoordTrans
Qt5::Gui
)
NGL_INSTALL_TARGET(svcIsmClient)
#
# --- Library svcIsmServer --------------------------------------------------------------------------------
#
SET(SRCS_server
ism_export.h
ism_db_impl_custom.cpp
ism_db_impl_custom.h
convert_db_to_dds.h
)
# generate ism_[d|f]ts.h, ism_[d|f]ts_impl.[cpp|h]
CODEGEN_SERVER_TOPICS(SRCS_server ${xml_FILE})
NGL_ADD_LIBRARY(WS AAR SV svcIsmServer SHARED ${SRCS_server})
NGL_TARGET_INCLUDE_DIRECTORIES(svcIsmServer
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../
${CMAKE_CURRENT_BINARY_DIR}/../
)
NGL_TARGET_LINK_LIBRARIES(svcIsmServer
PRIVATE
RTI::nddscpp2
ddsconnector
ddsfts
PUBLIC
svcIsmCommon
ngldb
LtsUtilsCore
LtsWebSocketServer
)
NGL_INSTALL_TARGET(svcIsmServer)
#
# --- Topic Type Plugin --------------------------------------------------------------
#
CREATE_TOPIC_TYPE_PLUGIN(${xml_FILE})
#
# --- Executable svcInfrastructureManagement (sISM) -------------------------------------------------
#
SET(SRCS_exe
base.cpp
base.h
dds_handler.cpp
dds_handler.h
handler_effect_area.cpp
handler_effect_area.h
handler_instrumentation_asset.cpp
handler_instrumentation_asset.h
handler_main_schedule.cpp
handler_main_schedule.h
handler_main_structure_element.cpp
handler_main_structure_element.h
handler_mounting_point_asset.cpp
handler_mounting_point_asset.h
handler_special_area.cpp
handler_special_area.h
main.cpp
main_handler.cpp
main_handler.h
object_effect_area.cpp
object_effect_area.h
object_instrumentation_asset.cpp
object_instrumentation_asset.h
object_main_schedule.cpp
object_main_schedule.h
object_main_structure_element.cpp
object_main_structure_element.h
object_mounting_point_asset.cpp
object_mounting_point_asset.h
object_special_area.cpp
object_special_area.h
object_structure_element.cpp
object_structure_element.h
settings.cpp
settings.h
WebSocketInterface/data_manager.cpp
WebSocketInterface/data_manager.h
WebSocketInterface/json_keys.h
WebSocketInterface/websocket_interface_handler.cpp
WebSocketInterface/websocket_interface_handler.h
WebSocketInterface/Messages/client_message.cpp
WebSocketInterface/Messages/client_message.h
WebSocketInterface/Messages/reply_message.cpp
WebSocketInterface/Messages/reply_message.h
log4cxx_ism.props
${xml_FILE}
)
# Generate ism.sql, ism.xml
CODEGEN_SQL(SRCS_exe ${xml_FILE})
NGL_ADD_SVC_ICON(SRCS_exe)
NGL_ADD_EXECUTABLE(AAR SV svcInfrastructureManagement ${SRCS_exe})
NGL_TARGET_LINK_LIBRARIES(svcInfrastructureManagement
Qt5::Core
Qt5::Xml
Qt5::Gui
svcCoreClient
svcIsmCommon
svcIsmServer
ddsconnector
nglsettings
ProjectConfig
LtsCommandLineParser
NGLLogger
nglcoreapplication
LtsCoordTrans
LtsWebSocketServer
svcAsmClient
svcExmClient
ngltools
)
NGL_INSTALL_TARGET(svcInfrastructureManagement)
NGL_INSTALL(AAR SV FILES log4cxx_ism.props DESTINATION bin)
NGL_ADD_TARGET_LINK(svcInfrastructureManagement sISM)
# Uncomment if necessary
#ADD_SUBDIRECTORY(UnitTests)
ADD_SUBDIRECTORY(ModuleTests)
ADD_SUBDIRECTORY(ImportBuildings)