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>
79 lines
1.6 KiB
CMake
79 lines
1.6 KiB
CMake
#
|
|
# $Id$
|
|
# $HeadURL$
|
|
# $Author$
|
|
#
|
|
|
|
|
|
#ADD_SUBDIRECTORY(TetraTestServer)
|
|
ADD_SUBDIRECTORY(LastTest)
|
|
ADD_SUBDIRECTORY(LastTestAuswertung)
|
|
|
|
SET(PrtCnv_SRCS
|
|
logger.h
|
|
logger.cpp
|
|
|
|
AppComponent.cpp
|
|
AppComponent.hpp
|
|
IAppComponent.hpp
|
|
PrtCnvApplication.cpp
|
|
PrtCnvApplication.hpp
|
|
PrtCnvBroadcastMgr.cpp
|
|
PrtCnvBroadcastMgr.hpp
|
|
PrtCnvCentralThread.cpp
|
|
PrtCnvCentralThread.hpp
|
|
PrtCnvDbThread.cpp
|
|
PrtCnvDbThread.hpp
|
|
PrtCnvInjectionSocket.cpp
|
|
PrtCnvInjectionSocket.hpp
|
|
PrtCnvInjectionThread.cpp
|
|
PrtCnvInjectionThread.hpp
|
|
PrtCnvMember.cpp
|
|
PrtCnvMember.hpp
|
|
PrtCnvRadioThread.cpp
|
|
PrtCnvRadioThread.hpp
|
|
PrtCnvRadioTrafficThread.cpp
|
|
PrtCnvRadioTrafficThread.hpp
|
|
PrtCnvSocketThread.cpp
|
|
PrtCnvSocketThread.hpp
|
|
PrtCnvStoredCentralTelegram.hpp
|
|
PrtCnvStoredRadioTelegram.hpp
|
|
PrtCnvStoredTelegram.hpp
|
|
PrtCnvTelegramLogThread.cpp
|
|
PrtCnvTelegramLogThread.hpp
|
|
PrtCnvThread.cpp
|
|
PrtCnvThread.hpp
|
|
PrtCnvThreadStarter.cpp
|
|
PrtCnvThreadStarter.hpp
|
|
)
|
|
|
|
NGL_ADD_LIBRARY2(AAR SV PrtCnvLib SHARED ${PrtCnv_SRCS})
|
|
NGL_TARGET_LINK_LIBRARIES(PrtCnvLib
|
|
PRIVATE
|
|
ngldb
|
|
nglsettings
|
|
LtsUtilsCoreHeaderOnly
|
|
Qt5::Sql
|
|
Qt5::WebSockets
|
|
PUBLIC
|
|
CoPrtCnv
|
|
Qt5::Core
|
|
Qt5::Network
|
|
NGLLogger
|
|
)
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(PrtCnvLib
|
|
PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
|
)
|
|
|
|
NGL_ADD_EXECUTABLE(AAR SV PrtCnv PrtCnvMain.cpp)
|
|
NGL_TARGET_LINK_LIBRARIES(PrtCnv
|
|
PrtCnvLib
|
|
Qt5::Core
|
|
LtsCommandLineParser
|
|
nglcoreapplication
|
|
)
|
|
NGL_INSTALL_TARGET(PrtCnv)
|
|
NGL_INSTALL(AAR SV FILES log4cxx_prtcnv.props DESTINATION bin)
|
|
NGL_INSTALL(AAR SV FILES PrtCnv.dat.tts DESTINATION bin)
|