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>
88 lines
1.7 KiB
CMake
88 lines
1.7 KiB
CMake
#
|
|
# $Id$
|
|
# $HeadURL$
|
|
# $Author$
|
|
# Created by Mike Wille, SLSE, 2016-05-15
|
|
#
|
|
|
|
|
|
# LtsSessionDataDds
|
|
SET(LtsSessionDataDds_SRCS
|
|
lts_session_data_dds.cpp
|
|
lts_session_data_dds.h
|
|
)
|
|
NGL_ADD_LIBRARY2(WS LtsSessionDataDds SHARED ${LtsSessionDataDds_SRCS})
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(LtsSessionDataDds
|
|
PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
|
${CMAKE_CURRENT_BINARY_DIR}/../
|
|
)
|
|
NGL_TARGET_LINK_LIBRARIES(LtsSessionDataDds
|
|
PRIVATE
|
|
ddsconnector
|
|
PUBLIC
|
|
ddscore
|
|
NGLLogger
|
|
Qt5::Core
|
|
)
|
|
|
|
|
|
|
|
# LtsSession
|
|
SET(ltssession_SRCS
|
|
lts_session_manager.h
|
|
lts_session_manager.cpp
|
|
lts_session.h
|
|
lts_session.cpp
|
|
lts_session_lock_handler.h
|
|
lts_session_lock_handler.cpp
|
|
)
|
|
|
|
NGL_ADD_LIBRARY2(WS LtsSession SHARED ${ltssession_SRCS})
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(LtsSession
|
|
PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
|
)
|
|
|
|
NGL_TARGET_LINK_LIBRARIES(LtsSession
|
|
PRIVATE
|
|
Qt5::Network
|
|
LtsMultiMonitor
|
|
LtsSessionData
|
|
ddsconnector
|
|
LtsUtilsGuiDds # ReqHelpr & for Debug Menu ! TODO: rm on release!
|
|
LtsNotification
|
|
svcCoreClient # Core Ftc - for TLH
|
|
OhpOnlineHelpViewerGuiPluginInterface
|
|
Qt5::Svg
|
|
PUBLIC
|
|
LtsWidgets
|
|
LtsSessionDataDds
|
|
Qt5::Core
|
|
GuiPluginInterface
|
|
DataPluginInterface
|
|
NGLLogger
|
|
ProjectConfig
|
|
)
|
|
|
|
|
|
# LtsSessionData (avoid cross-deps between AppManager, Session and PluginManager)
|
|
SET(LtsSessionData_SRCS
|
|
lts_session_data.cpp
|
|
lts_session_data.h
|
|
)
|
|
|
|
NGL_ADD_LIBRARY2(WS TOOLSSV TOOLSWS LtsSessionData SHARED ${LtsSessionData_SRCS})
|
|
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(LtsSessionData
|
|
PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
|
)
|
|
|
|
NGL_TARGET_LINK_LIBRARIES(LtsSessionData
|
|
PUBLIC
|
|
Qt5::Core
|
|
Qt5::Gui # QPixmap as Storage for Profile Picture
|
|
ddscore
|
|
)
|