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>
64 lines
1.6 KiB
CMake
64 lines
1.6 KiB
CMake
#
|
|
# $Id$
|
|
# $HeadURL$
|
|
# $Author$
|
|
# Created by Christian Ehrlicher, SLSE, 2016-02-29
|
|
#
|
|
|
|
IF(${CMAKE_VERSION} VERSION_LESS "3.6.0")
|
|
FIND_PACKAGE(Boost REQUIRED COMPONENTS system) # system wird nicht gebraucht, aber ohne Komponente wird das Boost::boost imported Target nicht angelegt (cmake <= 3.5.2)
|
|
ELSE()
|
|
FIND_PACKAGE(Boost REQUIRED)
|
|
ENDIF()
|
|
|
|
ADD_SUBDIRECTORY(Data)
|
|
ADD_SUBDIRECTORY(Gui)
|
|
ADD_SUBDIRECTORY(Shared)
|
|
|
|
|
|
#
|
|
# Menu Edit Gui Plugin Interface
|
|
#
|
|
ADD_INTERFACE_LIBRARY(AvmMenuEditGuiPluginInterface
|
|
${CMAKE_CURRENT_SOURCE_DIR}/avm_menu_edit_gui_plugin_interface.h
|
|
${CMAKE_CURRENT_SOURCE_DIR}/..
|
|
GuiPluginInterface TopicReplayInterface TopicEditorInterface Qt5::Core AvmShared Boost::boost
|
|
)
|
|
|
|
#
|
|
# Combat Net Radio Gui Plugin Interface
|
|
#
|
|
ADD_INTERFACE_LIBRARY(AvmCombatNetRadioGuiPluginInterface
|
|
${CMAKE_CURRENT_SOURCE_DIR}/avm_combat_net_radio_gui_plugin_interface.h
|
|
${CMAKE_CURRENT_SOURCE_DIR}/..
|
|
GuiPluginInterface Qt5::Core
|
|
)
|
|
|
|
#
|
|
# Eloka Gui Plugin Interface
|
|
#
|
|
ADD_INTERFACE_LIBRARY(AvmElokaGuiPluginInterface
|
|
${CMAKE_CURRENT_SOURCE_DIR}/avm_eloka_gui_plugin_interface.h
|
|
${CMAKE_CURRENT_SOURCE_DIR}/..
|
|
GuiPluginInterface
|
|
)
|
|
|
|
#
|
|
# MVS Gui Plugin Interface
|
|
#
|
|
ADD_INTERFACE_LIBRARY(AvmMvsVideoTeamGuiPluginInterface
|
|
${CMAKE_CURRENT_SOURCE_DIR}/avm_mvs_video_team_gui_plugin_interface.h
|
|
${CMAKE_CURRENT_SOURCE_DIR}/..
|
|
GuiPluginInterface
|
|
)
|
|
|
|
|
|
#
|
|
# Data Plugin 'Interface' - needs export for moc (signals)
|
|
#
|
|
ADD_INTERFACE_LIBRARY(AvmDataPluginInterface
|
|
${CMAKE_CURRENT_SOURCE_DIR}/avm_data_plugin_interface.h
|
|
${CMAKE_CURRENT_SOURCE_DIR}/..
|
|
DataPluginInterface svcAvmCommon Qt5::Core IsmDataPluginInterface
|
|
)
|