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>
51 lines
844 B
CMake
51 lines
844 B
CMake
#
|
|
# CMakeLists.txt for New SQL Browser
|
|
#
|
|
# $Id$
|
|
# $HeadURL$
|
|
# $Author$
|
|
# Created by Mike Wille, SLSE, 2016-02-10
|
|
#
|
|
|
|
SET(my_SRCS
|
|
main.cpp
|
|
LoginWnd.cpp
|
|
LoginWnd.h
|
|
BrowserWnd.cpp
|
|
BrowserWnd.h
|
|
WaitWnd.cpp
|
|
WaitWnd.h
|
|
Query.cpp
|
|
Query.h
|
|
QueryThread.cpp
|
|
QueryThread.h
|
|
DataModel.cpp
|
|
DataModel.h
|
|
PresetManager.cpp
|
|
PresetManager.h
|
|
AddModel.cpp
|
|
AddModel.h
|
|
AddLine.cpp
|
|
AddLine.h
|
|
)
|
|
|
|
SET(my_UICS
|
|
ui/LoginUi.ui
|
|
ui/BrowserWndUi.ui
|
|
ui/WaitWndUi.ui
|
|
ui/QueryUi.ui
|
|
ui/AddLinesUi.ui
|
|
)
|
|
|
|
NGL_ADD_TOOL_ICON(my_SRCS "sql")
|
|
NGL_WRAP_UI(my_SRCS ${my_UICS})
|
|
NGL_ADD_EXECUTABLE(AAR SV WS NO_TRANSLATION sqlbrowser ${my_SRCS} ${my_UICS})
|
|
NGL_TARGET_LINK_LIBRARIES(sqlbrowser
|
|
PUBLIC
|
|
nglapplication
|
|
Qt5::Core
|
|
Qt5::Widgets
|
|
Qt5::Sql
|
|
)
|
|
NGL_INSTALL_TARGET(sqlbrowser)
|