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).
43 lines
715 B
CMake
Executable File
43 lines
715 B
CMake
Executable File
#
|
|
# $Id$
|
|
# $HeadURL$
|
|
# $Author$
|
|
#
|
|
# CMakeLists.txt fuer topicdiscover
|
|
#
|
|
|
|
SET(topicdiscover_SRCS
|
|
topic_discoverer.cpp
|
|
topic_discoverer.h
|
|
)
|
|
|
|
NGL_ADD_LIBRARY(AAR SV WS NO_TRANSLATION topicdiscover SHARED ${topicdiscover_SRCS})
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(topicdiscover
|
|
INTERFACE
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../
|
|
)
|
|
NGL_TARGET_LINK_LIBRARIES(topicdiscover
|
|
PRIVATE
|
|
ddsQoS
|
|
NGLLogger
|
|
RTI::nddsc
|
|
RTI::nddscore
|
|
PUBLIC
|
|
Qt6::Core
|
|
RTI::nddscpp2
|
|
ddsQoS
|
|
)
|
|
|
|
NGL_INSTALL_TARGET(topicdiscover)
|
|
|
|
##################
|
|
|
|
NGL_ADD_EXECUTABLE(topicdiscoverexe AAR SV WS main.cpp)
|
|
|
|
NGL_TARGET_LINK_LIBRARIES(topicdiscoverexe
|
|
LtsCommandLineParser
|
|
nglcoreapplication
|
|
topicdiscover
|
|
NGLLogger
|
|
)
|