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>
62 lines
2.0 KiB
CMake
62 lines
2.0 KiB
CMake
# - Try to find the poppler PDF library
|
|
# Once done this will define
|
|
#
|
|
# POPPLER_QT5_FOUND - system has poppler
|
|
# POPPLER_QT5_INCLUDE_DIR - the poppler include directory
|
|
# POPPLER_QT5_LIBRARY - Link this to use poppler
|
|
#
|
|
|
|
# Copyright (c) 2006-2010, Pino Toscano, <pino@kde.org>
|
|
#
|
|
# Redistribution and use is allowed according to the terms of the BSD license.
|
|
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
|
|
|
|
if(POPPLER_QT5_INCLUDE_DIR AND POPPLER_QT5_LIBRARY)
|
|
|
|
# in cache already
|
|
set(POPPLER_QT5_FOUND TRUE)
|
|
|
|
else(POPPLER_QT5_INCLUDE_DIR AND POPPLER_QT5_LIBRARY)
|
|
|
|
set(_poppler_version_bad FALSE)
|
|
|
|
if(NOT WIN32)
|
|
# use pkg-config to get the directories and then use these values
|
|
# in the FIND_PATH() and FIND_LIBRARY() calls
|
|
include(FindPkgConfig)
|
|
pkg_check_modules(_pc_poppler poppler-qt5)
|
|
if(_pc_poppler_FOUND)
|
|
if(NOT "${_pc_poppler_VERSION}" VERSION_GREATER 0.24.0)
|
|
set(_poppler_version_bad TRUE)
|
|
endif(NOT "${_pc_poppler_VERSION}" VERSION_GREATER 0.24.0)
|
|
endif(_pc_poppler_FOUND)
|
|
endif(NOT WIN32)
|
|
|
|
if(NOT _poppler_version_bad)
|
|
set(POPPLER_QT5_FOUND FALSE)
|
|
|
|
find_library(POPPLER_QT5_LIBRARY poppler-qt5
|
|
HINTS ${_pc_poppler_LIBRARY_DIRS}
|
|
)
|
|
|
|
find_path(POPPLER_QT5_INCLUDE_DIR poppler-qt5.h
|
|
HINTS ${_pc_poppler_INCLUDE_DIRS}
|
|
PATH_SUFFIXES poppler/qt5
|
|
)
|
|
find_path(POPPLER_QT5_INCLUDE_DIR_core qt5/poppler-qt5.h
|
|
HINTS ${_pc_poppler_INCLUDE_DIRS}
|
|
PATH_SUFFIXES poppler
|
|
)
|
|
|
|
if(POPPLER_QT5_LIBRARY AND POPPLER_QT5_INCLUDE_DIR AND POPPLER_QT5_INCLUDE_DIR_core)
|
|
list(APPEND POPPLER_QT5_INCLUDE_DIR "${POPPLER_QT5_INCLUDE_DIR_core}")
|
|
set(POPPLER_QT5_FOUND TRUE)
|
|
endif(POPPLER_QT5_LIBRARY AND POPPLER_QT5_INCLUDE_DIR AND POPPLER_QT5_INCLUDE_DIR_core)
|
|
endif(NOT _poppler_version_bad)
|
|
|
|
INCLUDE(FindPackageHandleStandardArgs)
|
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS(PopplerQt5 DEFAULT_MSG
|
|
POPPLER_QT5_LIBRARY
|
|
POPPLER_QT5_INCLUDE_DIR)
|
|
endif(POPPLER_QT5_INCLUDE_DIR AND POPPLER_QT5_LIBRARY)
|