Berrux Kana
3f7beb3c7e
Continue the Qt5->Qt6 migration so the LTS Projects (Group 10) and LTS
Application (Group 11) compile, link, and ctest runs.
Qt5->Qt6 API migration (resolves removed/deprecated Qt6 APIs) across Lts
Tools and Apps, e.g. QAction->QActionGroup, QAbstractSocket::errorOccurred,
Qt::SkipEmptyParts, QRandomGenerator, QInputDevice::DeviceType,
QRegularExpression, QLatin1Literal->QStringLiteral, and the SampleModel
m_description->description rename.
CMake build fixes:
- CMakeLists.txt: add Lts/Common to CMAKE_AUTOMOC_INCLUDE_DIRECTORIES so moc
resolves Q_INTERFACES(ProjectPlugin::Plugin) for the migrated Projects.
- cmake/NGLMacros.cmake: NGL_COMPILE_RESOURCES - replace return() (which aborts
the calling CMakeLists.txt) with an if/else/endif.
- OpApp/THP: guard the ArcGISQt5Hack link with $<IF:$<TARGET_EXISTS:...>> (the
target is absent when the SituationMap viewer is stubbed); matches
CentralEffectSimulation.
- LtsSession: prefer the in-tree svcCoreClient target over a FIND_LIBRARY in
/usr/local/lib.
- CnrProxyTester/DotMatrixDisplay: set AUTOUIC_SEARCH_PATHS for the ui/ subdir.
- TopicDiscover: link NGLLogger.
Export-header visibility stubs (expand the empty *_EXPORT macro to
__attribute__((visibility("default"))); the build sets -fvisibility=hidden and
these stubs shadow the CMake-generated header):
- include/LtsProjectionWorkstation/ltsprojectionworkstation_export.h (fixes
undefined reference to LtsProjectionWorkstation::getInstance /
setProjectionOperatorPreset)
- include/LtsSession/ltssession_export.h, include/LtsUtilsGuiDds/ltsutilsguidds_export.h (same pattern)
New plugin modules (copied from legacy) so LtsAppDescriptorChecker finds the
gui:3 IIDs referenced by the Projects' apps.json:
- TakeHomePackageManager/OldTHP gui:3:tpm.man, gui:3:tpm.usb
- PresentationManagement/.../ScriptEditor gui:3:pre.script.edit
- Timeline/Gui/EventTimelineClassic gui:3:tln.view
new_docker_build.sh: correct group targets to the actual CMake target names,
guard LtsReportDisplay on BUILD_CODIFICATION, and skip modules unavailable in
the prebuilt image (AsmWorkstationCertifier/botan2, TrajectoryWidget,
VideoImport, thp_viewer/VLC).
57 lines
1.3 KiB
CMake
Executable File
57 lines
1.3 KiB
CMake
Executable File
# copy of displayPanelSimulator for testing with dotMatrixDisplay
|
|
|
|
|
|
SET(displayPanelSimulator_SRCS
|
|
cmdlineparser.cpp
|
|
displayPanelSimulatorMain.cpp
|
|
displayPanelSimulatorTcpServer.cpp
|
|
displayPanelSimulatorWidget.cpp
|
|
nglsettings.cpp
|
|
debugmessages.cpp
|
|
)
|
|
|
|
SET(displayPanelSimulator_HDRS
|
|
cmdlineparser.h
|
|
displayPanelSimulatorTcpServer.h
|
|
displayPanelSimulatorWidget.h
|
|
nglsettings.h
|
|
customMapsAndEnum.h
|
|
debugmessages.h
|
|
)
|
|
|
|
SET(displayPanelSimulator_UICS
|
|
ui/displayPanelSimulatorWidget.ui
|
|
ui/debugmessages.ui
|
|
)
|
|
|
|
NGL_WRAP_UI(displayPanelSimulator_SRCS ${displayPanelSimulator_UICS})
|
|
|
|
NGL_ADD_EXECUTABLE(WS NO_TRANSLATION displayPanelSimulator
|
|
${displayPanelSimulator_SRCS}
|
|
${displayPanelSimulator_HDRS}
|
|
)
|
|
|
|
# .ui files live in the ui/ subdirectory; AUTOUIC only searches the source
|
|
# dir by default, so tell it where to find them
|
|
set_target_properties(displayPanelSimulator PROPERTIES AUTOUIC_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/ui")
|
|
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(displayPanelSimulator
|
|
PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
|
)
|
|
|
|
NGL_TARGET_LINK_LIBRARIES(displayPanelSimulator
|
|
qledline
|
|
nglapplication
|
|
nglwidgets
|
|
NGLLogger
|
|
nglsettings
|
|
Qt6::Core
|
|
Qt6::Gui
|
|
Qt6::Widgets
|
|
Qt6::Network
|
|
)
|
|
CONFIGURE_FILE(rheinmetall.jpg ${CMAKE_BINARY_DIR}/rheinmetall.jpg COPYONLY)
|
|
|
|
NGL_INSTALL_TARGET_DEVEL(displayPanelSimulator)
|