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).
64 lines
1.6 KiB
CMake
Executable File
64 lines
1.6 KiB
CMake
Executable File
#
|
|
# $Id$
|
|
# $HeadURL$
|
|
# $Author$
|
|
#
|
|
|
|
# Make ${Qt6_Widgets} optional
|
|
if(QT6_GUI_AVAILABLE AND TARGET Qt6::Widgets)
|
|
set(Qt6_Widgets ${Qt6_Widgets})
|
|
else()
|
|
set(Qt6_Widgets "")
|
|
endif()
|
|
|
|
|
|
SET(LOG4CXX_PROPS_FILE log4cxx_opapp.props)
|
|
|
|
SET(mwt_SRCS
|
|
main.cpp
|
|
${LOG4CXX_PROPS_FILE}
|
|
)
|
|
|
|
IF(WIN32)
|
|
SET(JBN ${JENKINS_BUILD_NUMBER})
|
|
IF (NOT JENKINS_BUILD_NUMBER)
|
|
SET(JBN "0")
|
|
ENDIF()
|
|
SET(OPAPP_VERSION_INFO "${LTS_VERSION_MAJOR}, ${LTS_VERSION_MINOR}, ${JBN}, ${LTS_VERSION_PATCH}")
|
|
CONFIGURE_FILE(opapp.rc.cmake ${CMAKE_CURRENT_BINARY_DIR}/opapp.rc)
|
|
LIST(APPEND mwt_SRCS ${CMAKE_CURRENT_BINARY_DIR}/opapp.rc)
|
|
ENDIF()
|
|
NGL_ADD_APP_ICON(mwt_SRCS)
|
|
|
|
IF(BUILD_RPM)
|
|
NGL_ADD_EXECUTABLE(WS OperatorApplication WIN32 ${mwt_SRCS})
|
|
ELSE()
|
|
NGL_ADD_EXECUTABLE(WS OperatorApplication ${mwt_SRCS})
|
|
ENDIF()
|
|
|
|
if(QT6_GUI_AVAILABLE)
|
|
NGL_TARGET_LINK_LIBRARIES(OperatorApplication
|
|
$<IF:$<TARGET_EXISTS:ArcGISQt5Hack>,ArcGISQt5Hack,> # make sure it's loaded *before* libEsriCommonQt.so (guard: only linked when the SituationMap viewer is built, matching CentralEffectSimulation)
|
|
${Qt6_Widgets}
|
|
Qt6::Network
|
|
nglapplication
|
|
LtsCommandLineParser
|
|
NGLLogger
|
|
LtsSession
|
|
LtsPluginLoader
|
|
LtsAppDescriptor
|
|
LtsAppManager
|
|
LtsSessionData
|
|
LtsUtilsSettings
|
|
ngltranslator
|
|
nglsettings
|
|
LtsProjectionWorkstation
|
|
LtsMultiMonitor # TODO: rm if -m is out
|
|
LtsUtilsGuiConnectDialog # to set timeout if -v is set
|
|
LtsUtilsGuiStyleManager
|
|
)
|
|
endif()
|
|
NGL_INSTALL_TARGET(OperatorApplication)
|
|
|
|
NGL_INSTALL(FILES WS ${LOG4CXX_PROPS_FILE} DESTINATION "bin")
|