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>
105 lines
2.7 KiB
CMake
105 lines
2.7 KiB
CMake
#
|
|
# $Id$
|
|
# $HeadURL$
|
|
# $Author$
|
|
#
|
|
ADD_SUBDIRECTORY(Console)
|
|
SET(my_SRCS
|
|
IntegerCalculator.cpp
|
|
IntegerCalculator.hpp
|
|
logger.cpp
|
|
logger.h
|
|
LogViewBooleanEdit.cpp
|
|
LogViewBooleanEdit.hpp
|
|
LogViewDateTimeEdit.cpp
|
|
LogViewDateTimeEdit.hpp
|
|
LogViewEnumEdit.cpp
|
|
LogViewEnumEdit.hpp
|
|
LogViewField.cpp
|
|
LogViewField.hpp
|
|
LogViewGui.cpp
|
|
LogViewGui.hpp
|
|
LogViewInjectionThread.cpp
|
|
LogViewInjectionThread.hpp
|
|
LogViewMain.cpp
|
|
LogViewModels.cpp
|
|
LogViewModels.hpp
|
|
LogViewOptionDialog.cpp
|
|
LogViewOptionDialog.hpp
|
|
LogViewSpinBox.cpp
|
|
LogViewSpinBox.hpp
|
|
LogViewTableWidget.cpp
|
|
LogViewTableWidget.hpp
|
|
LogViewTabWidget.cpp
|
|
LogViewTabWidget.hpp
|
|
LogViewTelegram.cpp
|
|
LogViewTelegramDialog.cpp
|
|
LogViewTelegramDialog.hpp
|
|
LogViewTelegramEdit.cpp
|
|
LogViewTelegramEdit.hpp
|
|
LogViewTelegramEditModel.cpp
|
|
LogViewTelegramEditModel.hpp
|
|
LogViewTelegram.hpp
|
|
LogViewTelegramSelectionDialog.cpp
|
|
LogViewTelegramSelectionDialog.hpp
|
|
LogViewTetraTelegramsParser.cpp
|
|
LogViewTetraTelegramsParser.hpp
|
|
LogViewTextEdit.cpp
|
|
LogViewTextEdit.hpp
|
|
LogViewValueEdit.cpp
|
|
LogViewValueEdit.hpp
|
|
LogViewWidget.cpp
|
|
LogViewWidget.hpp
|
|
LogViewXdrElement.cpp
|
|
LogViewXdrElement.hpp
|
|
LogViewXdrParser.cpp
|
|
LogViewXdrParser.hpp
|
|
LogViewXdrStandardType.cpp
|
|
LogViewXdrStandardType.hpp
|
|
LogViewXdrStruct.cpp
|
|
LogViewXdrStruct.hpp
|
|
LogViewXdrType.cpp
|
|
LogViewXdrType.hpp
|
|
LogViewXdrValue.cpp
|
|
LogViewXdrValue.hpp
|
|
zsksxd_tetraForLogView.x
|
|
)
|
|
|
|
QT5_ADD_RESOURCES(my_SRCS LogViewResources.qrc)
|
|
NGL_ADD_TOOL_ICON(my_SRCS)
|
|
NGL_ADD_EXECUTABLE(AAR SV NO_TRANSLATION LogView ${my_SRCS})
|
|
|
|
NGL_TARGET_LINK_LIBRARIES(LogView
|
|
Qt5::Core
|
|
Qt5::Gui
|
|
Qt5::Network
|
|
CoPrtCnv
|
|
nglwidgets
|
|
NGLLogger
|
|
nglapplication
|
|
ngltools
|
|
)
|
|
NGL_INSTALL_TARGET(LogView)
|
|
NGL_INSTALL(AAR SV FILES LogView_log4cxx.props DESTINATION bin)
|
|
|
|
|
|
|
|
# install on RPM build and copy for local builds so that LogView automatically finds the zsksxd_tetraForLogView.x file
|
|
if (BUILD_RPM)
|
|
add_custom_target(zsksxd_tetraForLogView.x_bin) # empty target so that LogView still builds on RPM build
|
|
NGL_INSTALL(AAR SV FILES zsksxd_tetraForLogView.x DESTINATION bin)
|
|
else()
|
|
add_custom_command(
|
|
OUTPUT ${CMAKE_BINARY_DIR}/bin/zsksxd_tetraForLogView.x
|
|
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/zsksxd_tetraForLogView.x ${CMAKE_BINARY_DIR}/bin/zsksxd_tetraForLogView.x
|
|
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/zsksxd_tetraForLogView.x
|
|
COMMENT "[Local build] Copy zsksxd_tetraForLogView.x for LogView into bin/"
|
|
)
|
|
add_custom_target(zsksxd_tetraForLogView.x_bin DEPENDS ${CMAKE_BINARY_DIR}/bin/zsksxd_tetraForLogView.x)
|
|
endif()
|
|
|
|
if (TARGET LogView)
|
|
add_dependencies(LogView zsksxd_tetraForLogView.x_bin training_area_telegrams.h_bin)
|
|
endif()
|
|
|