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>
42 lines
1.2 KiB
CMake
42 lines
1.2 KiB
CMake
#
|
|
# $Id: CMakeLists.txt 54406 2021-08-17 05:47:57Z karwat $
|
|
# $HeadURL: svn://slssvn/TDS/branches/product/iterations/21_07_assault_energy/Lts/Projects/Qatar/CMakeLists.txt $
|
|
# $Author: karwat $
|
|
#
|
|
# Created by Mike Wille, SLTE, 2021-11-11
|
|
#
|
|
|
|
SET(ProjectQatarMOUTPlugin_SRCS
|
|
main.h
|
|
main.cpp
|
|
qatar_mout_resources.qrc
|
|
./resources/apps.json
|
|
)
|
|
|
|
NGL_COMPILE_RESOURCES(ProjectQatarMOUTPlugin_SRCS qatar_mout_resources.qrc)
|
|
NGL_ADD_LIBRARY(WS ProjectQatarMOUTPlugin MODULE ${ProjectQatarMOUTPlugin_SRCS})
|
|
|
|
NGL_TARGET_LINK_LIBRARIES(ProjectQatarMOUTPlugin
|
|
PUBLIC
|
|
Qt5::Core
|
|
ProjectPluginInterface
|
|
)
|
|
|
|
NGL_INSTALL_TARGET(ProjectQatarMOUTPlugin)
|
|
|
|
NGL_TEST_APPS_JSON(ProjectQatarMOUTPlugin)
|
|
|
|
IF(BUILD_RPM AND DEFINED _pname)
|
|
IF(UNIX AND "${_pname}" STREQUAL "qatarmout")
|
|
MESSAGE("Install lts-cc conf for QATAR MOUT")
|
|
SET(_etc_dir /etc/)
|
|
INSTALL(FILES lts-cc.conf DESTINATION ${_etc_dir})
|
|
|
|
MESSAGE("Install licence File for QATAR MOUT")
|
|
NGL_INSTALL(SV FILES licence_file.crl DESTINATION "./share/Lts/Licence")
|
|
|
|
MESSAGE("Install effect_config File for QATAR MOUT")
|
|
NGL_INSTALL(SV FILES resources/effect_config.xml DESTINATION "./share/Lts/Buildings")
|
|
ENDIF()
|
|
ENDIF()
|