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>
39 lines
854 B
CMake
39 lines
854 B
CMake
#
|
|
# Tool for sending http-requests to a REST API
|
|
# $Id$
|
|
# $HeadURL$
|
|
# $Author$
|
|
# Created by Hannes Fritsche, ESZS, 2026-08-25
|
|
#
|
|
|
|
SET(SRCS
|
|
main_window.cpp
|
|
main_window.h
|
|
main.cpp
|
|
)
|
|
|
|
NGL_WRAP_UI(SRCS main_window.ui)
|
|
|
|
NGL_ADD_EXECUTABLE(TOOLSWS RestClientUi ${SRCS})
|
|
|
|
NGL_INSTALL(WS DIRECTORY rest_templates/ DESTINATION bin/updates/)
|
|
|
|
NGL_TARGET_LINK_LIBRARIES(RestClientUi
|
|
Qt5::Widgets
|
|
Qt5::Gui
|
|
LtsRestClient
|
|
)
|
|
|
|
NGL_INSTALL_TARGET(RestClientUi)
|
|
|
|
IF (BUILD_TOOLSWS)
|
|
SET(TEMPLATES_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/rest_templates")
|
|
SET(TEMPLATES_DESTINATION "${CMAKE_BINARY_DIR}/bin/rest_templates")
|
|
|
|
ADD_CUSTOM_COMMAND(
|
|
TARGET RestClientUi POST_BUILD
|
|
COMMAND ${CMAKE_COMMAND} -E copy_directory "${TEMPLATES_SOURCE}" "${TEMPLATES_DESTINATION}"
|
|
COMMENT "Copy ${TEMPLATES_SOURCE} to ${TEMPLATES_DESTINATION}"
|
|
)
|
|
ENDIF()
|