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>
80 lines
1.7 KiB
CMake
80 lines
1.7 KiB
CMake
#
|
|
# $Id$
|
|
# $HeadURL$
|
|
# $Author$
|
|
# Created by Philipp Dassow, SLST, 2017-11-28
|
|
|
|
#
|
|
# --- Library LtsWebSocketCommon --------------------------------------------------------------------------------
|
|
#
|
|
SET(LtsWebSocketCommon_SRCS
|
|
client_message_factory.cpp
|
|
client_message_factory.h
|
|
client_message.cpp
|
|
client_message.h
|
|
reply_message.cpp
|
|
reply_message.h
|
|
data_manager_base_dl.h
|
|
json_keys.h
|
|
|
|
logger.cpp
|
|
logger.h
|
|
)
|
|
|
|
NGL_ADD_LIBRARY2(WS AAR SV LtsWebSocketCommon SHARED ${LtsWebSocketCommon_SRCS})
|
|
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(LtsWebSocketCommon
|
|
PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
|
)
|
|
|
|
NGL_TARGET_LINK_LIBRARIES(LtsWebSocketCommon
|
|
Qt5::Core
|
|
Qt5::WebSockets
|
|
NGLLogger
|
|
)
|
|
|
|
#
|
|
# --- Library ltsWebSocketServer --------------------------------------------------------------------------------
|
|
#
|
|
SET(LtsWebSocketServer_SRCS
|
|
client_connection.cpp
|
|
client_connection.h
|
|
connection_handler.cpp
|
|
connection_handler.h
|
|
lts_web_socket_server.cpp
|
|
lts_web_socket_server.h
|
|
)
|
|
|
|
NGL_ADD_LIBRARY2(WS AAR SV LtsWebSocketServer SHARED ${LtsWebSocketServer_SRCS})
|
|
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(LtsWebSocketServer
|
|
PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
|
)
|
|
|
|
NGL_TARGET_LINK_LIBRARIES(LtsWebSocketServer
|
|
Qt5::Core
|
|
LtsWebSocketCommon
|
|
)
|
|
|
|
#
|
|
# --- Library ltsWebSocketClient --------------------------------------------------------------------------------
|
|
#
|
|
SET(LtsWebSocketClient_SRCS
|
|
lts_web_socket_client.cpp
|
|
lts_web_socket_client.h
|
|
)
|
|
|
|
NGL_ADD_LIBRARY2(WS AAR SV LtsWebSocketClient SHARED ${LtsWebSocketClient_SRCS})
|
|
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(LtsWebSocketClient
|
|
PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
|
)
|
|
|
|
NGL_TARGET_LINK_LIBRARIES(LtsWebSocketClient
|
|
Qt5::Core
|
|
LtsWebSocketCommon
|
|
)
|