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>
33 lines
619 B
CMake
Executable File
33 lines
619 B
CMake
Executable File
# Modified CMakeLists.txt from github.com/wille-io/httq
|
|
|
|
set(src
|
|
include/http_parser.h
|
|
include/http_parser.c # TODO: move out of include dir
|
|
|
|
include/httq/AbstractServer.h
|
|
include/httq/DataStream.h
|
|
include/httq/HttpRequest.h
|
|
include/httq/Logger.h
|
|
|
|
AbstractServer.cpp
|
|
DataStream.cpp
|
|
HttpRequest.cpp
|
|
Logger.cpp
|
|
)
|
|
|
|
NGL_ADD_LIBRARY2(SV WS httq SHARED ${src})
|
|
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(httq
|
|
PUBLIC
|
|
${CMAKE_CURRENT_BINARY_DIR}/../ # export file
|
|
${CMAKE_CURRENT_SOURCE_DIR}/include/
|
|
)
|
|
|
|
NGL_TARGET_LINK_LIBRARIES(httq
|
|
Qt5::Core
|
|
Qt5::Network
|
|
Qt5::WebSockets
|
|
)
|
|
|
|
NGL_INSTALL_TARGET(httq)
|