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>
44 lines
1013 B
CMake
44 lines
1013 B
CMake
#
|
|
# $Id$
|
|
# $HeadURL$
|
|
# $Author$
|
|
#
|
|
|
|
FIND_PACKAGE(Threads REQUIRED)
|
|
|
|
SET(ddsgen_SRCS
|
|
dynamic_data_reader.h
|
|
generic_base.cpp
|
|
generic_base.h
|
|
generic_data_reader.h
|
|
generic_data_writer.h
|
|
generic_logger.cpp
|
|
generic_logger.h
|
|
subscriber_listener.cpp
|
|
subscriber_listener.h
|
|
topic_description.h
|
|
wait_set_handler.cpp
|
|
wait_set_handler.h
|
|
)
|
|
|
|
NGL_ADD_LIBRARY2(AAR SV HLA WS ddsgen SHARED ${ddsgen_SRCS} ${ddsgen_HDRS})
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(ddsgen
|
|
PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../../
|
|
${CMAKE_CURRENT_BINARY_DIR}/../../
|
|
)
|
|
NGL_TARGET_LINK_LIBRARIES(ddsgen
|
|
PUBLIC
|
|
${CMAKE_THREAD_LIBS_INIT}
|
|
Qt5::Core
|
|
RTI::nddscpp2
|
|
NGLLogger
|
|
LtsUtilsCoreHeaderOnly
|
|
)
|
|
|
|
# topic_type_plugin
|
|
ADD_LIBRARY(topic_type_plugin INTERFACE)
|
|
TARGET_SOURCES(topic_type_plugin INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/topic_type_plugin.h)
|
|
TARGET_INCLUDE_DIRECTORIES(topic_type_plugin INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/../../)
|
|
TARGET_LINK_LIBRARIES(topic_type_plugin INTERFACE ddsgen Qt5::Core)
|