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
2.2 KiB
CMake
50 lines
2.2 KiB
CMake
# -------------------------------------------------------------------------
|
|
# $HeadURL$
|
|
# -------------------------------------------------------------------------
|
|
#!
|
|
# -------------------------------------------------------------------------
|
|
# COPYRIGHT (C) 2017: RHEINMETALL ELECTRONICS GmbH, D-28305 BREMEN
|
|
# -------------------------------------------------------------------------
|
|
#
|
|
# Revision INFO:
|
|
# --------------
|
|
# $Revision$
|
|
# $Date$
|
|
# $Id$
|
|
#
|
|
# PURPOSE:
|
|
# --------
|
|
# Suchen der KDReports-Library und Setzen der folgenden CMake-Variablen:
|
|
# KDREPORTS_INCLUDE_DIRS - KDReports headers location
|
|
# KDREPORTS_LIBRARY - KDReports library
|
|
# KDREPORTS_FOUND - TRUE wenn Library gefunden wurde
|
|
#
|
|
|
|
FIND_PACKAGE(Qt5 COMPONENTS Core Gui PrintSupport Sql Svg Widgets Xml REQUIRED)
|
|
IF(KDREPORTS_INCLUDE_DIR AND KDREPORTS_KDREPORTS_INCLUDE_DIR AND KDREPORTS_LIBRARY)
|
|
SET(KDREPORTS_FOUND TRUE)
|
|
ELSE()
|
|
|
|
FIND_PATH(KDREPORTS_INCLUDE_DIR KDReports/KDReports.h)
|
|
FIND_PATH(KDREPORTS_KDREPORTS_INCLUDE_DIR KDReports.h PATH_SUFFIXES KDReports)
|
|
FIND_LIBRARY(KDREPORTS_LIBRARY NAMES kdreports)
|
|
|
|
INCLUDE(FindPackageHandleStandardArgs)
|
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS(KDReports DEFAULT_MSG
|
|
KDREPORTS_LIBRARY
|
|
KDREPORTS_INCLUDE_DIR
|
|
KDREPORTS_KDREPORTS_INCLUDE_DIR
|
|
)
|
|
|
|
MARK_AS_ADVANCED(KDREPORTS_INCLUDE_DIR KDREPORTS_LIBRARY)
|
|
MARK_AS_ADVANCED(KDREPORTS_KDREPORTS_INCLUDE_DIR KDREPORTS_LIBRARY)
|
|
ENDIF()
|
|
|
|
IF(NOT TARGET KDReports::KDReports)
|
|
ADD_LIBRARY(KDReports::KDReports UNKNOWN IMPORTED)
|
|
SET_PROPERTY(TARGET KDReports::KDReports PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${KDREPORTS_INCLUDE_DIR}" "${KDREPORTS_KDREPORTS_INCLUDE_DIR}")
|
|
SET_PROPERTY(TARGET KDReports::KDReports PROPERTY INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${KDREPORTS_INCLUDE_DIR}" "${KDREPORTS_KDREPORTS_INCLUDE_DIR}") # -isystem
|
|
SET_PROPERTY(TARGET KDReports::KDReports PROPERTY IMPORTED_LOCATION "${KDREPORTS_LIBRARY}")
|
|
SET_PROPERTY(TARGET KDReports::KDReports APPEND PROPERTY INTERFACE_LINK_LIBRARIES Qt5::Core Qt5::Gui Qt5::PrintSupport Qt5::Widgets)
|
|
ENDIF()
|