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>
88 lines
1.7 KiB
CMake
88 lines
1.7 KiB
CMake
#
|
|
# $Id$
|
|
# $HeadURL$
|
|
# $Author$
|
|
#
|
|
#
|
|
# --- Executable svcWirelessLocationSystem (svcWLS) -------------------------------------------------
|
|
#
|
|
SET(xml_FILE wls_service.xml)
|
|
|
|
SET(SRCS_exe
|
|
dds_handler.cpp
|
|
dds_handler.h
|
|
ism_handler.cpp
|
|
ism_handler.h
|
|
logger.cpp
|
|
logger.h
|
|
main.cpp
|
|
main_handler.cpp
|
|
main_handler.h
|
|
settings.cpp
|
|
settings.h
|
|
web_socket_handler.cpp
|
|
web_socket_handler.h
|
|
wls_handler.cpp
|
|
wls_handler.h
|
|
wls_participant.cpp
|
|
wls_participant.h
|
|
wls_participant_handler.cpp
|
|
wls_participant_handler.h
|
|
wls_sfm_message_converter.cpp
|
|
wls_sfm_message_converter.h
|
|
wls_sfm_message.cpp
|
|
wls_sfm_message.h
|
|
)
|
|
# make sure xml file is properly installed
|
|
CODEGEN_HANDLE_SVC_XML(SRCS_exe ${xml_FILE})
|
|
|
|
NGL_ADD_SVC_ICON(SRCS_exe)
|
|
NGL_ADD_EXECUTABLE(AAR SV svcWirelessLocationSystem ${SRCS_exe})
|
|
NGL_TARGET_LINK_LIBRARIES(svcWirelessLocationSystem
|
|
Qt5::Core
|
|
Qt5::Network
|
|
Qt5::WebSockets
|
|
svcCoreClient
|
|
svcIsmClient
|
|
ddsconnector
|
|
SfmConverter
|
|
LtsCommandLineParser
|
|
LtsCoordTrans
|
|
LtsUtilsCore
|
|
NGLLogger
|
|
nglcoreapplication
|
|
nglsettings
|
|
ngltools
|
|
tabTelegrams
|
|
)
|
|
NGL_INSTALL_TARGET(svcWirelessLocationSystem)
|
|
NGL_INSTALL(AAR SV FILES log4cxx_wls.props DESTINATION bin)
|
|
NGL_ADD_TARGET_LINK(svcWirelessLocationSystem pWLS)
|
|
|
|
NGL_ADD_EXECUTABLE(AAR SV wlsJsonClientTest wls_json_client_test.cpp wls_json_client_test.h)
|
|
NGL_TARGET_LINK_LIBRARIES(wlsJsonClientTest
|
|
Qt5::Core
|
|
Qt5::WebSockets
|
|
)
|
|
|
|
NGL_ADD_LIBRARY2(SfmConverter AAR SV SHARED
|
|
logger.cpp
|
|
logger.h
|
|
wls_sfm_message_converter.cpp
|
|
wls_sfm_message_converter.h
|
|
wls_sfm_message.cpp
|
|
wls_sfm_message.h
|
|
)
|
|
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(SfmConverter
|
|
PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
|
)
|
|
|
|
NGL_TARGET_LINK_LIBRARIES(SfmConverter
|
|
Qt5::Core
|
|
LtsUtilsCore
|
|
NGLLogger
|
|
)
|
|
|