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>
112 lines
2.5 KiB
CMake
112 lines
2.5 KiB
CMake
#
|
|
# $Id$
|
|
# $HeadURL$
|
|
# $Author$
|
|
# Created by Mike Wille, SLSE, 2016-05-30
|
|
#
|
|
|
|
ADD_SUBDIRECTORY(Data)
|
|
ADD_SUBDIRECTORY(Gui) #TODO: mit patric sprechen!
|
|
|
|
#
|
|
# SAAB import Gui Plugin Interface
|
|
#
|
|
ADD_INTERFACE_LIBRARY(PpmSaabImportGuiPluginInterface
|
|
${CMAKE_CURRENT_SOURCE_DIR}/ppm_saab_import_gui_plugin_interface.h
|
|
${CMAKE_CURRENT_SOURCE_DIR}/..
|
|
GuiPluginInterface
|
|
)
|
|
|
|
#
|
|
# MSDL Gui Plugin Interface
|
|
#
|
|
ADD_INTERFACE_LIBRARY(PpmMSDLGuiPluginInterface
|
|
${CMAKE_CURRENT_SOURCE_DIR}/ppm_msdl_gui_plugin_interface.h
|
|
${CMAKE_CURRENT_SOURCE_DIR}/..
|
|
GuiPluginInterface
|
|
)
|
|
|
|
#
|
|
# Player Info Gui Plugin Interface
|
|
#
|
|
ADD_INTERFACE_LIBRARY(PpmParticipantInfoGuiPluginInterface
|
|
${CMAKE_CURRENT_SOURCE_DIR}/ppm_participant_info_gui_plugin_interface.h
|
|
${CMAKE_CURRENT_SOURCE_DIR}/..
|
|
GuiPluginInterface
|
|
)
|
|
|
|
#
|
|
# Template Gui Plugin Interface
|
|
#
|
|
ADD_INTERFACE_LIBRARY(PpmGuiTemplatesPluginInterface
|
|
${CMAKE_CURRENT_SOURCE_DIR}/ppm_templates_gui_plugin_interface.h
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../../
|
|
GuiPluginInterface
|
|
)
|
|
|
|
#
|
|
# Types Gui Plugin Interface
|
|
#
|
|
ADD_INTERFACE_LIBRARY(PpmGuiTypesPluginInterface
|
|
${CMAKE_CURRENT_SOURCE_DIR}/ppm_types_gui_plugin_interface.h
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../../
|
|
GuiPluginInterface
|
|
)
|
|
|
|
#
|
|
# Party Gui Plugin Interface
|
|
#
|
|
ADD_INTERFACE_LIBRARY(PpmGuiPartyPluginInterface
|
|
${CMAKE_CURRENT_SOURCE_DIR}/ppm_party_gui_plugin_interface.h
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../../
|
|
GuiPluginInterface
|
|
)
|
|
|
|
#
|
|
# Participant Gui Plugin Interface
|
|
#
|
|
ADD_INTERFACE_LIBRARY(PpmGuiParticipantsPluginInterface
|
|
${CMAKE_CURRENT_SOURCE_DIR}/ppm_participants_gui_plugin_interface.h
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../../
|
|
GuiPluginInterface
|
|
)
|
|
|
|
#
|
|
# Combobox Gui Plugin Interface
|
|
#
|
|
ADD_INTERFACE_LIBRARY(PpmGuiComboboxPluginInterface
|
|
${CMAKE_CURRENT_SOURCE_DIR}/ppm_gui_combobox_plugin_interface.h
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../../
|
|
GuiPluginInterface
|
|
svcPpmCommon
|
|
)
|
|
|
|
#
|
|
# Data Plugin Interface
|
|
#
|
|
ADD_INTERFACE_LIBRARY(PpmDataPluginInterface
|
|
${CMAKE_CURRENT_SOURCE_DIR}/ppm_data_plugin_interface.h
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../../
|
|
DataPluginInterface
|
|
svcPpmCommon
|
|
)
|
|
|
|
IF(${Qt5WebEngineWidgets_VERSION} VERSION_GREATER 5.7.9)
|
|
#
|
|
# Combat Power Gui Plugin Interface
|
|
#
|
|
ADD_INTERFACE_LIBRARY(
|
|
PpmGuiOrgChartPluginInterface
|
|
${CMAKE_CURRENT_SOURCE_DIR}/ppm_org_chart_gui_plugin.h
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../../
|
|
)
|
|
ENDIF()
|
|
|
|
# GuiElementInterface
|
|
ADD_INTERFACE_LIBRARY(
|
|
GuiElementInterface
|
|
${CMAKE_CURRENT_SOURCE_DIR}/participant_info_gui_element_interface.h
|
|
${CMAKE_CURRENT_SOURCE_DIR}/..
|
|
Qt5::Core LtsWidgets
|
|
)
|