torstenandCopilot
7173785915
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>
109 lines
2.5 KiB
CMake
109 lines
2.5 KiB
CMake
#
|
|
# $Id$
|
|
# $HeadURL$
|
|
# $Author$
|
|
#
|
|
|
|
#
|
|
# --- Library svcCnrHelper --------------------------------------------------------------------------------
|
|
#
|
|
SET(SRCS_helper
|
|
Helper/cnr_frequency_planning_helper.cpp
|
|
Helper/cnr_frequency_planning_helper.h
|
|
)
|
|
|
|
NGL_ADD_LIBRARY2(WS SV svcCnrHelper SHARED ${SRCS_helper})
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(svcCnrHelper
|
|
PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
|
${CMAKE_CURRENT_BINARY_DIR}/../
|
|
)
|
|
|
|
NGL_TARGET_LINK_LIBRARIES(svcCnrHelper
|
|
# PRIVATE
|
|
# RTI::nddscpp2
|
|
# ddsconnector
|
|
# ddsfts
|
|
PUBLIC
|
|
svcAvmCommon
|
|
Qt5::Core
|
|
# svcAesCommon
|
|
# ngldb
|
|
)
|
|
NGL_INSTALL_TARGET(svcCnrHelper)
|
|
|
|
#
|
|
# --- Executable svcCombatNetRadio (pCNR) -------------------------------------------------
|
|
#
|
|
SET(xml_FILE cnr_service.xml)
|
|
|
|
SET(SRCS_exe
|
|
dds_handler.cpp
|
|
dds_handler.h
|
|
logger.cpp
|
|
logger.h
|
|
main.cpp
|
|
main_handler.cpp
|
|
main_handler.h
|
|
active_exercises.cpp
|
|
active_exercises.h
|
|
exercise_manager.cpp
|
|
exercise_manager.h
|
|
dds_handler_exercise.cpp
|
|
dds_handler_exercise.h
|
|
training_area.cpp
|
|
training_area.h
|
|
config_cnr.cpp
|
|
config_cnr.h
|
|
positions_cnr.cpp
|
|
positions_cnr.h
|
|
helper.cpp
|
|
helper.h
|
|
|
|
WebSocketInterface/json_keys.h
|
|
WebSocketInterface/websocket_interface_handler.cpp
|
|
WebSocketInterface/websocket_interface_handler.h
|
|
WebSocketInterface/Connection/client_connection.cpp
|
|
WebSocketInterface/Connection/client_connection.h
|
|
WebSocketInterface/Connection/connection_handler.cpp
|
|
WebSocketInterface/Connection/connection_handler.h
|
|
WebSocketInterface/Messages/client_message.cpp
|
|
WebSocketInterface/Messages/client_message.h
|
|
WebSocketInterface/Messages/message_handler.cpp
|
|
WebSocketInterface/Messages/message_handler.h
|
|
WebSocketInterface/Messages/message_transmitter.h
|
|
WebSocketInterface/Messages/reply_message.cpp
|
|
WebSocketInterface/Messages/reply_message.h
|
|
|
|
cnr_service.xml
|
|
log4cxx_cnr.props
|
|
)
|
|
# make sure xml file is properly installed
|
|
CODEGEN_HANDLE_SVC_XML(SRCS_exe ${xml_FILE})
|
|
|
|
NGL_ADD_SVC_ICON(SRCS_exe)
|
|
NGL_ADD_EXECUTABLE(AAR SV svcCombatNetRadio ${SRCS_exe})
|
|
NGL_TARGET_LINK_LIBRARIES(svcCombatNetRadio
|
|
ddsconnector
|
|
ddscore
|
|
LtsCommandLineParser
|
|
LtsCoordTrans
|
|
LtsUtilsCore
|
|
nglcoreapplication
|
|
NGLLogger
|
|
Qt5::Core
|
|
Qt5::Network
|
|
Qt5::WebSockets
|
|
ngltools
|
|
svcCoreClient
|
|
svcCnrHelper
|
|
svcIsmClient
|
|
svcExmClient
|
|
svcPpmClient
|
|
svcAvmClient
|
|
svcAsmClient
|
|
)
|
|
NGL_INSTALL_TARGET(svcCombatNetRadio)
|
|
NGL_INSTALL(AAR SV FILES log4cxx_cnr.props DESTINATION bin)
|
|
NGL_ADD_TARGET_LINK(svcCombatNetRadio pCNR)
|