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).
128 lines
3.4 KiB
CMake
Executable File
128 lines
3.4 KiB
CMake
Executable File
#
|
|
# THP-Viewer
|
|
#
|
|
ADD_SUBDIRECTORY(THP-Starter)
|
|
FIND_PACKAGE(VLC REQUIRED)
|
|
|
|
SET(thp_viewer_SRCS
|
|
main.cpp
|
|
thp_plugin_provider.cpp
|
|
thp_plugin_provider.h
|
|
thp_situation_filter_interface_impl.cpp
|
|
thp_situation_filter_interface_impl.h
|
|
thp_viewer.cpp
|
|
thp_viewer.h
|
|
|
|
thpwidgets/thp_audio_video_widget.cpp
|
|
thpwidgets/thp_audio_video_widget.h
|
|
thpwidgets/thp_audio_video_widget_p.h
|
|
thpwidgets/thp_building_settings.cpp
|
|
thpwidgets/thp_building_settings.h
|
|
thpwidgets/thp_building_widget.cpp
|
|
thpwidgets/thp_building_widget.h
|
|
thpwidgets/thp_html_widget.cpp
|
|
thpwidgets/thp_html_widget.h
|
|
thpwidgets/thp_pdf_widget.cpp
|
|
thpwidgets/thp_pdf_widget.h
|
|
thpwidgets/thp_situation_building_base.h
|
|
thpwidgets/thp_situation_building_base.cpp
|
|
thpwidgets/thp_situation_filter_aes.cpp
|
|
thpwidgets/thp_situation_filter_aes.h
|
|
thpwidgets/thp_situation_filter_building_components.cpp
|
|
thpwidgets/thp_situation_filter_building_components.h
|
|
thpwidgets/thp_situation_filter_collapse_expand.cpp
|
|
thpwidgets/thp_situation_filter_collapse_expand.h
|
|
thpwidgets/thp_situation_filter_symbol_appearance.cpp
|
|
thpwidgets/thp_situation_filter_symbol_appearance.h
|
|
thpwidgets/thp_situation_filter_types.cpp
|
|
thpwidgets/thp_situation_filter_types.h
|
|
thpwidgets/thp_situation_widget.cpp
|
|
thpwidgets/thp_situation_widget.h
|
|
thpwidgets/thp_zoom_slider.cpp
|
|
thpwidgets/thp_zoom_slider.h
|
|
)
|
|
|
|
NGL_WRAP_UI(thp_viewer_SRCS
|
|
thp_viewer.ui
|
|
thpwidgets/thp_audio_video_widget.ui
|
|
thpwidgets/thp_building_settings.ui
|
|
thpwidgets/thp_html_widget.ui
|
|
thpwidgets/thp_pdf_widget.ui
|
|
thpwidgets/thp_situation_building_base.ui
|
|
)
|
|
IF(WIN32)
|
|
SET(JBN ${JENKINS_BUILD_NUMBER})
|
|
IF (NOT JENKINS_BUILD_NUMBER)
|
|
SET(JBN "0")
|
|
ENDIF()
|
|
SET(THP_VERSION_INFO "${LTS_VERSION_MAJOR}, ${LTS_VERSION_MINOR}, ${JBN}, ${LTS_VERSION_PATCH}")
|
|
CONFIGURE_FILE(thp_viewer.rc.cmake ${CMAKE_CURRENT_BINARY_DIR}/thp_viewer.rc)
|
|
LIST(APPEND thp_viewer_SRCS ${CMAKE_CURRENT_BINARY_DIR}/thp_viewer.rc)
|
|
ENDIF(WIN32)
|
|
NGL_ADD_APP_ICON(thp_viewer_SRCS)
|
|
|
|
NGL_ADD_EXECUTABLE(WS thp_viewer WIN32 ${thp_viewer_SRCS})
|
|
NGL_INSTALL_TARGET(thp_viewer)
|
|
NGL_TARGET_INCLUDE_DIRECTORIES(thp_viewer
|
|
PRIVATE
|
|
${VLC_INCLUDE_DIR}
|
|
)
|
|
NGL_TARGET_COMPILE_DEFINITIONS(thp_viewer
|
|
PRIVATE
|
|
${VLC_DEFINES}
|
|
)
|
|
NGL_TARGET_LINK_LIBRARIES(thp_viewer
|
|
$<IF:$<TARGET_EXISTS:ArcGISQt5Hack>,ArcGISQt5Hack,> # make sure it's loaded *before* libEsriCommonQt.so (guard: only linked when the SituationMap viewer is built, matching CentralEffectSimulation)
|
|
|
|
${VLC_LIBRARIES}
|
|
Qt6::Core
|
|
Qt6::Gui
|
|
Qt6::PrintSupport
|
|
Qt6::Svg
|
|
Qt6::WebEngineCore
|
|
Qt6::WebEngineWidgets
|
|
Qt6::Widgets
|
|
Qt6::Xml
|
|
|
|
RmeLightStyleQrc
|
|
|
|
AsbData
|
|
AsbForeignDataPluginThp
|
|
BuildingViewerCommon
|
|
FltAesGuiCommon
|
|
FltAesWidget
|
|
FltBldgCmpntWidget
|
|
FltParticipantWidget
|
|
IsmDataPluginThp
|
|
LtsCoordTrans
|
|
LtsCommandLineParser
|
|
NGLLogger
|
|
nglsingleapplication
|
|
ngltools
|
|
ngltranslator
|
|
nglwidgets
|
|
PdmComboBoxGui
|
|
PpmComboBoxGui
|
|
SitmapDds
|
|
SituationReplaySqlite
|
|
|
|
svcFlmCommon
|
|
|
|
svcAesClient
|
|
svcBldClient
|
|
svcCesClient
|
|
svcGimClient
|
|
svcIsmClient
|
|
svcPpmClient
|
|
svcPdmClient
|
|
svcAlmClient
|
|
)
|
|
IF(WIN32)
|
|
# NGL_INSTALL(WS FILES autorun.inf DESTINATION bin)
|
|
# NGL_INSTALL(WS FILES readme.win32.en_US.txt DESTINATION bin)
|
|
# NGL_INSTALL(WS FILES readme.win32.de_DE.txt DESTINATION bin)
|
|
ENDIF()
|
|
NGL_INSTALL(WS FILES log4cxx_thp_viewer.props DESTINATION bin)
|
|
|
|
ADD_SUBDIRECTORY(SitMapReplayTest)
|