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>
46 lines
856 B
CMake
46 lines
856 B
CMake
#
|
|
# $Id$
|
|
# $HeadURL$
|
|
# $Author$
|
|
#
|
|
|
|
ADD_LIBRARY(ddsfts_connext INTERFACE)
|
|
TARGET_INCLUDE_DIRECTORIES(ddsfts_connext
|
|
INTERFACE
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../../
|
|
)
|
|
TARGET_LINK_LIBRARIES(ddsfts_connext
|
|
INTERFACE
|
|
RTI::nddscpp2
|
|
)
|
|
SET(SRCS
|
|
${CMAKE_CURRENT_SOURCE_DIR}/connext.h
|
|
)
|
|
TARGET_SOURCES(ddsfts_connext INTERFACE ${SRCS})
|
|
|
|
|
|
SET(SRCS
|
|
generic_fts.h ;# Interface
|
|
generic_fts_impl.h ;# Implementation, using internal class GenericFTCInternal
|
|
generic_fts_internal.h
|
|
generic_fts_internal.cpp
|
|
)
|
|
|
|
NGL_ADD_LIBRARY2(WS AAR SV HLA ddsfts SHARED ${SRCS})
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(
|
|
INTERFACE
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../../
|
|
)
|
|
NGL_TARGET_LINK_LIBRARIES(ddsfts
|
|
PRIVATE
|
|
RTI::nddscore
|
|
ProjectConfig
|
|
ddsQoS
|
|
PUBLIC
|
|
Qt5::Core
|
|
RTI::nddsc
|
|
RTI::nddscpp2
|
|
ddsgen
|
|
ddsfts_connext
|
|
)
|