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>
53 lines
1.1 KiB
CMake
53 lines
1.1 KiB
CMake
# copy of displayPanelSimulator for testing with dotMatrixDisplay
|
|
|
|
|
|
SET(displayPanelSimulator_SRCS
|
|
cmdlineparser.cpp
|
|
displayPanelSimulatorMain.cpp
|
|
displayPanelSimulatorTcpServer.cpp
|
|
displayPanelSimulatorWidget.cpp
|
|
nglsettings.cpp
|
|
debugmessages.cpp
|
|
)
|
|
|
|
SET(displayPanelSimulator_HDRS
|
|
cmdlineparser.h
|
|
displayPanelSimulatorTcpServer.h
|
|
displayPanelSimulatorWidget.h
|
|
nglsettings.h
|
|
customMapsAndEnum.h
|
|
debugmessages.h
|
|
)
|
|
|
|
SET(displayPanelSimulator_UICS
|
|
ui/displayPanelSimulatorWidget.ui
|
|
ui/debugmessages.ui
|
|
)
|
|
|
|
NGL_WRAP_UI(displayPanelSimulator_SRCS ${displayPanelSimulator_UICS})
|
|
|
|
NGL_ADD_EXECUTABLE(WS NO_TRANSLATION displayPanelSimulator
|
|
${displayPanelSimulator_SRCS}
|
|
${displayPanelSimulator_HDRS}
|
|
)
|
|
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(displayPanelSimulator
|
|
PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
|
)
|
|
|
|
NGL_TARGET_LINK_LIBRARIES(displayPanelSimulator
|
|
qledline
|
|
nglapplication
|
|
nglwidgets
|
|
NGLLogger
|
|
nglsettings
|
|
Qt5::Core
|
|
Qt5::Gui
|
|
Qt5::Widgets
|
|
Qt5::Network
|
|
)
|
|
CONFIGURE_FILE(rheinmetall.jpg ${CMAKE_BINARY_DIR}/rheinmetall.jpg COPYONLY)
|
|
|
|
NGL_INSTALL_TARGET_DEVEL(displayPanelSimulator)
|