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>
129 lines
2.4 KiB
CMake
129 lines
2.4 KiB
CMake
#
|
|
# $Id$
|
|
# $HeadURL$
|
|
# $Author$
|
|
#
|
|
|
|
FIND_PACKAGE(RTI REQUIRED)
|
|
FIND_PACKAGE(Grantlee5 REQUIRED)
|
|
|
|
NGL_ADD_LIBRARY(ALL codegen_base SHARED
|
|
codegen_export.h
|
|
SqlGenerator.cpp
|
|
SqlGenerator.h
|
|
StructBuilder.cpp
|
|
StructBuilder.h
|
|
XmlReader.cpp
|
|
XmlReader.h
|
|
)
|
|
NGL_TARGET_LINK_LIBRARIES(codegen_base
|
|
PRIVATE
|
|
Qt5::Xml
|
|
NGLLogger
|
|
ngltools
|
|
PUBLIC
|
|
Qt5::Core
|
|
)
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(codegen_base
|
|
PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
|
$<TARGET_PROPERTY:RTI::nddscpp2,INTERFACE_INCLUDE_DIRECTORIES>
|
|
)
|
|
NGL_TARGET_COMPILE_DEFINITIONS(codegen_base
|
|
PUBLIC
|
|
$<TARGET_PROPERTY:RTI::nddscpp2,INTERFACE_COMPILE_DEFINITIONS>
|
|
)
|
|
NGL_INSTALL_TARGET(codegen_base)
|
|
|
|
NGL_ADD_LIBRARY(ALL codegen_grantlee STATIC
|
|
CppTopicGeneratorGrantlee.cpp
|
|
CppTopicGeneratorGrantlee.h
|
|
DaoGeneratorGrantlee.cpp
|
|
DaoGeneratorGrantlee.h
|
|
DatabaseGeneratorGrantlee.cpp
|
|
DatabaseGeneratorGrantlee.h
|
|
GeneratorGrantleeBase.cpp
|
|
GeneratorGrantleeBase.h
|
|
GrantleeWrappers.cpp
|
|
GrantleeWrappers.h
|
|
|
|
svc.idl.grantlee
|
|
svc_enums.idl.grantlee
|
|
|
|
svc_translation.cpp.grantlee
|
|
svc_translation.h.grantlee
|
|
|
|
svc_dao.cpp.grantlee
|
|
svc_dao.h.grantlee
|
|
|
|
svc_db.h.grantlee
|
|
svc_db_impl.h.grantlee
|
|
svc_db_impl.cpp.grantlee
|
|
|
|
svc_dtc.h.grantlee
|
|
svc_dtc_impl.cpp.grantlee
|
|
svc_dtc_impl.h.grantlee
|
|
|
|
svc_dts.h.grantlee
|
|
svc_dts_impl.cpp.grantlee
|
|
svc_dts_impl.h.grantlee
|
|
|
|
svc_ftc.h.grantlee
|
|
svc_ftc_impl.cpp.grantlee
|
|
svc_ftc_impl.h.grantlee
|
|
|
|
svc_fts.h.grantlee
|
|
svc_fts_impl.cpp.grantlee
|
|
svc_fts_impl.h.grantlee
|
|
|
|
svc_json.cpp.grantlee
|
|
svc_json.h.grantlee
|
|
|
|
svc_topic_type_plugin.cpp.grantlee
|
|
svc_topic_type_plugin.h.grantlee
|
|
|
|
svc_record_replay_plugin.cpp.grantlee
|
|
svc_record_replay_plugin.h.grantlee
|
|
|
|
codegen_simple.py
|
|
)
|
|
|
|
NGL_TARGET_LINK_LIBRARIES(codegen_grantlee
|
|
PRIVATE
|
|
Grantlee5::Templates
|
|
NGLLogger
|
|
ProjectConfig
|
|
PUBLIC
|
|
codegen_base
|
|
)
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(codegen_grantlee
|
|
PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
|
)
|
|
|
|
NGL_ADD_EXECUTABLE(ALL codegen
|
|
main_grantlee.cpp
|
|
)
|
|
NGL_TARGET_LINK_LIBRARIES(codegen
|
|
codegen_grantlee
|
|
LtsCommandLineParser
|
|
nglcoreapplication
|
|
Qt5::Core
|
|
)
|
|
|
|
NGL_WRAP_UI(codegen_gui_uics
|
|
main_grantlee_gui.ui
|
|
)
|
|
NGL_ADD_EXECUTABLE(WS AAR SV NO_TRANSLATION codegen_gui
|
|
${codegen_gui_uics}
|
|
main_grantlee_gui.cpp
|
|
main_grantlee_gui.ui
|
|
)
|
|
NGL_TARGET_LINK_LIBRARIES(codegen_gui
|
|
codegen_grantlee
|
|
LtsCommandLineParser
|
|
nglapplication
|
|
Qt5::Widgets
|
|
Grantlee5::Templates
|
|
)
|