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>
50 lines
1.3 KiB
CMake
50 lines
1.3 KiB
CMake
# $HeadURL$
|
|
# -------------------------------------------------------------------------
|
|
#!
|
|
# -------------------------------------------------------------------------
|
|
# COPYRIGHT (C) 2008: RHEINMETALL DEFENCE ELECTRONICS GmbH, D-28305 BREMEN
|
|
# -------------------------------------------------------------------------
|
|
#
|
|
# HIER/ITEM : CSU: RP 5187 P 0211 SRC 14001
|
|
# BRIEF DESC: CMake-Findskript
|
|
# AUTHOR : RDE / SGS
|
|
# ORIGIN REF: BWB / Projekt GUEZ-HAS
|
|
#
|
|
# Revision INFO:
|
|
# --------------
|
|
# $Revision$
|
|
# $Date$
|
|
# $Id$
|
|
#
|
|
# - Find VLC libraries
|
|
# Find the VLClib includes and library
|
|
#
|
|
# VLC_INCLUDE_DIR - where to find the vlc includes.
|
|
# VLC_LIBRARIES - List of libraries when using VLClib
|
|
# VLC_FOUND - True if RDESimCore found.
|
|
|
|
IF(VLC_INCLUDE_DIR AND VLC_LIBRARIES)
|
|
|
|
# in cache already
|
|
SET(VLC_FOUND TRUE)
|
|
|
|
ELSE()
|
|
|
|
INCLUDE(FindPackageHandleStandardArgs)
|
|
INCLUDE(FindLibraryWithDebug)
|
|
|
|
FIND_LIBRARY_WITH_DEBUG(VLC_LIBRARIES WIN32_DEBUG_POSTFIX d NAMES vlc libvlc)
|
|
FIND_PATH(VLC_INCLUDE_DIR vlc/vlc.h)
|
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS(VLC DEFAULT_MSG VLC_LIBRARIES VLC_INCLUDE_DIR)
|
|
|
|
FIND_PATH(VLC_IS_2_0_ABOVE vlc/libvlc_version.h
|
|
PATHS ${VLC_INCLUDE_DIR}
|
|
NO_DEFAULT_PATH)
|
|
|
|
IF(NOT VLC_IS_2_0_ABOVE)
|
|
MESSAGE(FATAL_ERROR "Need at least VLC 2.x")
|
|
ENDIF()
|
|
MARK_AS_ADVANCED(VLC_DEFINES)
|
|
|
|
ENDIF()
|