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>
60 lines
1.4 KiB
CMake
60 lines
1.4 KiB
CMake
#
|
|
# $Id$
|
|
# $HeadURL$
|
|
# $Author$
|
|
#
|
|
|
|
# Da diese Script außerhalb von /shd/CTC installiert werden müssen,
|
|
# können wir nicht NGL_INSTALL benutzen sondern müssen
|
|
# über 'IF(BUILD_FOO)' gehen
|
|
|
|
# Startscripte
|
|
IF(UNIX)
|
|
SET(_systemd_dir /etc/systemd/system/)
|
|
SET(_user_systemd_graph_dir /shd/CTC/WS/.config/systemd/user/graphical.target.wants)
|
|
SET(_user_systemd_dir /shd/CTC/WS/.config/systemd/user)
|
|
|
|
|
|
SET(_ld_dir /etc/ld.so.conf.d/)
|
|
SET(_limits_dir /etc/security/limits.d/)
|
|
|
|
# Server
|
|
IF(BUILD_SV)
|
|
# Startscript
|
|
INSTALL(FILES lts_sv.service DESTINATION ${_systemd_dir})
|
|
# ldconfig
|
|
INSTALL(FILES lts_sv.conf DESTINATION ${_ld_dir})
|
|
# limits
|
|
INSTALL(FILES lts_sv_limits.conf DESTINATION ${_limits_dir})
|
|
ENDIF(BUILD_SV)
|
|
|
|
# HLA
|
|
IF(BUILD_HLA)
|
|
# ldconfig
|
|
INSTALL(FILES lts_sv.conf DESTINATION ${_ld_dir})
|
|
ENDIF(BUILD_HLA)
|
|
|
|
# AAR
|
|
IF(BUILD_AAR)
|
|
# Startscript
|
|
INSTALL(FILES lts_sv.service DESTINATION ${_systemd_dir})
|
|
# ldconfig
|
|
INSTALL(FILES lts_aar.conf DESTINATION ${_ld_dir})
|
|
# limits
|
|
INSTALL(FILES lts_aar_limits.conf DESTINATION ${_limits_dir})
|
|
ENDIF(BUILD_AAR)
|
|
|
|
# Workstation
|
|
IF(BUILD_WS)
|
|
# ldconfig
|
|
INSTALL(DIRECTORY DESTINATION ${_user_systemd_graph_dir})
|
|
|
|
INSTALL(FILES usb_mount.service DESTINATION ${_user_systemd_dir})
|
|
|
|
INSTALL(FILES lts_ws.conf DESTINATION ${_ld_dir})
|
|
|
|
|
|
ENDIF(BUILD_WS)
|
|
|
|
ENDIF(UNIX)
|