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>
41 lines
1.5 KiB
CMake
41 lines
1.5 KiB
CMake
# -------------------------------------------------------------------------
|
|
# $HeadURL$
|
|
# -------------------------------------------------------------------------
|
|
#!
|
|
# -------------------------------------------------------------------------
|
|
# COPYRIGHT (C) 2017: RHEINMETALL ELECTRONICS GmbH, D-28305 BREMEN
|
|
# -------------------------------------------------------------------------
|
|
#
|
|
# Revision INFO:
|
|
# --------------
|
|
# $Revision$
|
|
# $Date$
|
|
# $Id$
|
|
#
|
|
# PURPOSE:
|
|
# --------
|
|
# Suchen der KDChart-Library und Setzen der folgenden CMake-Variablen:
|
|
# KDCHART_INCLUDE_DIRS - KDChart headers location
|
|
# KDCHART_LIBRARY - KDChart library
|
|
# KDCHART_FOUND - TRUE wenn Library gefunden wurde
|
|
#
|
|
IF(KDCHART_INCLUDE_DIRS AND KDCHART_LIBRARY)
|
|
SET(KDCHART_FOUND TRUE)
|
|
ELSE()
|
|
|
|
FIND_PATH(KDCHART_INCLUDE_DIRS KDChart/kdchart_export.h)
|
|
FIND_LIBRARY(KDCHART_LIBRARY NAMES kdchart)
|
|
|
|
INCLUDE(FindPackageHandleStandardArgs)
|
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS(KDChart DEFAULT_MSG KDCHART_LIBRARY KDCHART_INCLUDE_DIRS)
|
|
|
|
MARK_AS_ADVANCED(KDCHART_INCLUDE_DIRS KDCHART_LIBRARY)
|
|
ENDIF()
|
|
|
|
IF(NOT TARGET KDChart::KDChart)
|
|
ADD_LIBRARY(KDChart::KDChart UNKNOWN IMPORTED)
|
|
SET_PROPERTY(TARGET KDChart::KDChart PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${KDCHART_INCLUDE_DIRS}")
|
|
SET_PROPERTY(TARGET KDChart::KDChart PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${KDCHART_INCLUDE_DIRS}") # -isystem
|
|
SET_PROPERTY(TARGET KDChart::KDChart PROPERTY IMPORTED_LOCATION "${KDCHART_LIBRARY}")
|
|
ENDIF()
|