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>
52 lines
935 B
CMake
52 lines
935 B
CMake
#
|
|
# $Id: CMakeLists.txt 60251 2023-09-07 05:15:55Z karwat $
|
|
# $HeadURL: svn://slssvn/TDS/branches/product/features/3dws_devel/Lts/Services/CentralEffectSimulation/ModuleTests/CMakeLists.txt $
|
|
# $Author: karwat $
|
|
#
|
|
|
|
####################################
|
|
# Feed GeoJson
|
|
####################################
|
|
|
|
SET(FEED_GEO_JSON
|
|
feedGeoJson.cpp
|
|
feedGeoJson.h
|
|
logger.cpp
|
|
logger.h
|
|
)
|
|
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(cesTestsGasPipe
|
|
PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
|
${CMAKE_CURRENT_BINARY_DIR}/../
|
|
)
|
|
|
|
# Testing FunctionTopic Functionality (FTC)
|
|
ADD_EXECUTABLE(feedGeoJson ${FEED_GEO_JSON})
|
|
TARGET_LINK_LIBRARIES(feedGeoJson
|
|
Qt5::Core
|
|
Qt5::Test
|
|
RTI::nddscpp2
|
|
svcAesCommon
|
|
svcAesClient
|
|
svcCesClient
|
|
svcPdmClient
|
|
svcPpmClient
|
|
|
|
svcAesServer
|
|
svcIsmServer
|
|
svcPdmServer
|
|
svcPpmServer
|
|
svcBldServer
|
|
svcTabServer
|
|
svcMdmServer
|
|
svcCoreClient
|
|
LtsCommandLineParser
|
|
LtsCoordTrans
|
|
ddsconnector
|
|
nglcoreapplication
|
|
|
|
)
|
|
|
|
|