Complete Qt6 migration: full clean build green across groups G1-G12 incl. runtime plugin set
new_docker_build.sh gains Group 12 (212 GUI/Data plugins); fixes LtsUtilsGuiDds visibility (LTO-stripped exports), LtsProjectionWorkstation unity name shadow, 6 unity-off dirs (dup file-scope statics, ddsftc INTERFACE sources) and reconfigures BUILD_FILTERMANAGEMENT/BUILD_PLUGINS_SERVICEMONITOR=ON
This commit is contained in:
1 parent
eb1d949edc
commit
815e16368e
1718 files changed
+126739
-18495
No files matched your search
@@ -82,6 +82,9 @@ SET(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||
# (The qt5 legacy has no include/ tree; Lts/ is the real include root.)
|
||||
include_directories(BEFORE ${CMAKE_SOURCE_DIR}/Lts)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/include)
|
||||
# Legacy also used source-root-relative includes (<Lts/Services/<Svc>/logger.h>, ...);
|
||||
# the source root must be an include root so those resolve.
|
||||
include_directories(${CMAKE_SOURCE_DIR})
|
||||
# Include directory for generated export headers
|
||||
include_directories(${CMAKE_BINARY_DIR})
|
||||
include_directories(${CMAKE_SOURCE_DIR}/Z/src)
|
||||
@@ -89,10 +92,28 @@ include_directories(${CMAKE_SOURCE_DIR}/Z/src)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/Z/src)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/Z/src/ngltools)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap/Symbology)
|
||||
# <Symbology/...> headers (symbol_dictionary.h, sidc_codec.h, ...) are consumed tree-wide
|
||||
# (e.g. AdvancedSymbology/asb_data_plugin_interface.h is pulled into PpmCommon), so the
|
||||
# parent dir must be a global root too, not only on the AdvancedSymbology target.
|
||||
include_directories(${CMAKE_SOURCE_DIR}/Lts/Viewer/SituationMap)
|
||||
# Generated SymbologyGui/advancedsymbologygui_export.h lives in the build dir; the source
|
||||
# SituationMap root above only covers the source Symbology headers.
|
||||
include_directories(${CMAKE_BINARY_DIR}/Lts/Viewer/SituationMap)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/Lts/Viewer/LtsDataView)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/Lts/Proxies/TrainingAreaBase)
|
||||
include_directories(${CMAKE_BINARY_DIR}/Lts/Services/ProjectDataManagement)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/Lts/Services)
|
||||
# Consumers include generated DDS service headers by service-prefixed name
|
||||
# (<ParticipantManagement/ppm.hpp>, <GuezNasat/gna_dtc.h>, ...). Those headers
|
||||
# live in the per-service BUILD dirs, so the binary Lts/Services ROOT must be
|
||||
# visible tree-wide (the per-service build dirs below only satisfy the bare
|
||||
# <ppm.hpp> form). Placed right after the source Lts/Services so a header
|
||||
# present in both still resolves to the source (binary only supplies the
|
||||
# generated headers). This mirrors the legacy <Services/...> form.
|
||||
include_directories(${CMAKE_BINARY_DIR}/Lts/Services)
|
||||
# Generated DDS headers for Proxies (GuezNasat/gna_dtc.h, ...) live under the binary
|
||||
# Lts/Proxies dir; consumers include them by proxy-prefixed name (<GuezNasat/gna_dtc.h>).
|
||||
include_directories(${CMAKE_BINARY_DIR}/Lts/Proxies)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/include/ProjectDataManagement)
|
||||
include_directories(${CMAKE_BINARY_DIR}/Lts/Services/InfrastructureManagement)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/include/InfrastructureManagement)
|
||||
@@ -120,6 +141,9 @@ include_directories(${CMAKE_SOURCE_DIR}/include/SituationReplay)
|
||||
# is added (same shape as FileManagement above, which has no stub tree either).
|
||||
include_directories(${CMAKE_BINARY_DIR}/Lts/Services/Evaluations)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/Lts/Proxies/GuezNasat)
|
||||
# GuezNasat's generated export header (svcgnacommon_export.h) lives in the build dir;
|
||||
# logger.h includes it by bare name, so the build dir must be visible tree-wide.
|
||||
include_directories(${CMAKE_BINARY_DIR}/Lts/Proxies/GuezNasat)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/Lts/DDS)
|
||||
include_directories(${CMAKE_SOURCE_DIR}/Lts/DDS/QosProfile)
|
||||
# Generated DDS headers (BUILD_RTI=ON)
|
||||
@@ -137,6 +161,9 @@ include_directories(${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsCore)
|
||||
# directory holding the generated header has to be visible tree-wide. The directory contains
|
||||
# only that generated header, so appending it cannot shadow an existing include.
|
||||
include_directories(${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsSettings)
|
||||
# LtsUtilsGui ConnectDialog's generated ltsutilsguiconnectdialog_export.h is included by bare
|
||||
# name from connect_dialog.h / connect_dialog_nt.h; same tree-wide visibility as the dirs above.
|
||||
include_directories(${CMAKE_BINARY_DIR}/Lts/Common/LtsUtils/LtsUtilsGui/ConnectDialog)
|
||||
# DDSConnector's generated ddsconnector_export.h is included by bare name from
|
||||
# dds_connector.h and pub_sub_base.h, and reaches targets (the AES ModuleTests) that include
|
||||
# DDSConnector headers without linking ddsconnector. Same shape as LtsUtilsSettings above: the
|
||||
@@ -192,6 +219,12 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Lts)
|
||||
IF(BUILD_RTI)
|
||||
# Define BUILD_RTI as preprocessor macro for all targets
|
||||
ADD_COMPILE_DEFINITIONS(BUILD_RTI)
|
||||
# External (RTI) DDS is available: compile the BUILD_WITH_EXTERNAL_DDS code paths
|
||||
# (used by 73 guards across plugins, e.g. MrkCommon's MarkerManagementDialogModel /
|
||||
# CustomViewMarker). Legacy always compiled this DDS code; the flag is a migration
|
||||
# option that was never wired into CMake, so its absence silently dropped the
|
||||
# definitions while the unguarded class declarations still referenced them (link error).
|
||||
ADD_COMPILE_DEFINITIONS(BUILD_WITH_EXTERNAL_DDS)
|
||||
ENDIF()
|
||||
OPTION(BUILD_ARCGIS "Build ArcGIS SDK dependent modules" ON)
|
||||
OPTION(BUILD_FILTERMANAGEMENT "Build FilterManagement plugins (temporarily disabled for migration)" OFF)
|
||||
@@ -232,6 +265,11 @@ ELSE()
|
||||
IF(EXISTS "${ARCGIS_SDK_DIR}")
|
||||
LIST(APPEND CMAKE_PREFIX_PATH "${ARCGIS_SDK_DIR}")
|
||||
MESSAGE(STATUS "ArcGIS SDK found at: ${ARCGIS_SDK_DIR}")
|
||||
# arcgisversion.h (a custom RME file in the SDK include dir) is pulled in via
|
||||
# <SituationMap/Map/layer_factory.h> by many non-ArcGIS plugin targets (e.g.
|
||||
# IsmResGuiPlugin); the ArcGIS::ArcGIS target include dir does not reach them, so
|
||||
# expose the SDK include dir tree-wide when the SDK is present.
|
||||
include_directories(${ARCGIS_SDK_DIR}/include)
|
||||
ELSE()
|
||||
MESSAGE(WARNING "ArcGIS SDK not found at: ${ARCGIS_SDK_DIR}")
|
||||
ENDIF()
|
||||
@@ -327,6 +365,14 @@ if(NOT TARGET Qt6::Core)
|
||||
find_package(Qt6 6.2 COMPONENTS Core REQUIRED)
|
||||
endif()
|
||||
|
||||
# Qt State Machine (QState/QStateMachine) was moved out of QtGui in Qt6 into the
|
||||
# separate "Qt State Machine" add-on (the qtscxml package). In Qt5 the state
|
||||
# machine classes lived inside QtGui/QtCore, so the ExerciseManagement state
|
||||
# machines (exercise_state_base/exercise_state_machine) compiled without an
|
||||
# explicit StateMachine dependency. Probe for the module now; if present the
|
||||
# affected targets link Qt6::StateMachine (guarded per-target below).
|
||||
find_package(Qt6 6.2 COMPONENTS StateMachine QUIET)
|
||||
|
||||
# Create imported targets for all available Qt6 libraries
|
||||
# Use Qt6 installation path from find_package or fall back to system paths
|
||||
if(Qt6Core_DIR)
|
||||
@@ -397,6 +443,30 @@ if(EXISTS "${QT6_LIB_DIR}/libQt6Widgets.so.6")
|
||||
message(STATUS "Manually configured Qt6 Widgets target")
|
||||
endif()
|
||||
|
||||
# Qt6::OpenGL - create manual target if not found (QOpenGLPaintDevice, used by ArcGIS SDK)
|
||||
if(NOT TARGET Qt6::OpenGL AND EXISTS "${QT6_LIB_DIR}/libQt6OpenGL.so.6")
|
||||
add_library(Qt6::OpenGL SHARED IMPORTED)
|
||||
set_target_properties(Qt6::OpenGL PROPERTIES
|
||||
IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6OpenGL.so.6"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtGui;${QT6_INC_DIR}"
|
||||
INTERFACE_LINK_LIBRARIES "Qt6::Core"
|
||||
)
|
||||
message(STATUS "Manually configured Qt6 OpenGL target")
|
||||
endif()
|
||||
|
||||
# Qt6::OpenGLWidgets - create manual target if not found
|
||||
# (QOpenGLWidget, used by the ArcGIS SDK MapGraphicsView/SceneGraphicsView objects;
|
||||
# Qt6 splits QOpenGLWidget into its own libQt6OpenGLWidgets.so)
|
||||
if(NOT TARGET Qt6::OpenGLWidgets AND EXISTS "${QT6_LIB_DIR}/libQt6OpenGLWidgets.so.6")
|
||||
add_library(Qt6::OpenGLWidgets SHARED IMPORTED)
|
||||
set_target_properties(Qt6::OpenGLWidgets PROPERTIES
|
||||
IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6OpenGLWidgets.so.6"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtWidgets;${QT6_INC_DIR}"
|
||||
INTERFACE_LINK_LIBRARIES "Qt6::Core;Qt6::Gui;Qt6::Widgets"
|
||||
)
|
||||
message(STATUS "Manually configured Qt6 OpenGLWidgets target")
|
||||
endif()
|
||||
|
||||
# Qt6::Sql - create manual target if not found
|
||||
if(NOT TARGET Qt6::Sql AND EXISTS "${QT6_LIB_DIR}/libQt6Sql.so.6")
|
||||
add_library(Qt6::Sql SHARED IMPORTED)
|
||||
@@ -502,6 +572,30 @@ if(NOT TARGET Qt6::SerialPort)
|
||||
message(STATUS "Created stub target for Qt6::SerialPort (library not available)")
|
||||
endif()
|
||||
|
||||
# Qt6::WebEngineCore - real imported target if the library exists (stub below otherwise).
|
||||
# The stub carries no library, so targets linking it (e.g. SmoSystemMonitorGuiPlugin)
|
||||
# fail --no-undefined on QWebEngine* symbols.
|
||||
if(NOT TARGET Qt6::WebEngineCore AND EXISTS "${QT6_LIB_DIR}/libQt6WebEngineCore.so.6")
|
||||
add_library(Qt6::WebEngineCore SHARED IMPORTED)
|
||||
set_target_properties(Qt6::WebEngineCore PROPERTIES
|
||||
IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6WebEngineCore.so.6"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtWebEngineCore;${QT6_INC_DIR}"
|
||||
INTERFACE_LINK_LIBRARIES "Qt6::Core;Qt6::Gui"
|
||||
)
|
||||
message(STATUS "Manually configured Qt6 WebEngineCore target")
|
||||
endif()
|
||||
|
||||
# Qt6::WebEngineWidgets - real imported target if the library exists.
|
||||
if(NOT TARGET Qt6::WebEngineWidgets AND EXISTS "${QT6_LIB_DIR}/libQt6WebEngineWidgets.so.6")
|
||||
add_library(Qt6::WebEngineWidgets SHARED IMPORTED)
|
||||
set_target_properties(Qt6::WebEngineWidgets PROPERTIES
|
||||
IMPORTED_LOCATION "${QT6_LIB_DIR}/libQt6WebEngineWidgets.so.6"
|
||||
INTERFACE_INCLUDE_DIRECTORIES "${QT6_INC_DIR}/QtWebEngineWidgets;${QT6_INC_DIR}"
|
||||
INTERFACE_LINK_LIBRARIES "Qt6::Core;Qt6::Gui;Qt6::Widgets;Qt6::WebEngineCore"
|
||||
)
|
||||
message(STATUS "Manually configured Qt6 WebEngineWidgets target")
|
||||
endif()
|
||||
|
||||
# Stub Qt6::WebEngineCore target if not available (needed by thp_viewer)
|
||||
if(NOT TARGET Qt6::WebEngineCore)
|
||||
add_library(Qt6::WebEngineCore INTERFACE IMPORTED)
|
||||
@@ -686,6 +780,26 @@ IF(BUILD_RTI)
|
||||
# reach the AutogenInfo MOC_INCLUDES.
|
||||
SET(CMAKE_AUTOMOC_INCLUDE_DIRECTORIES ${CMAKE_AUTOMOC_INCLUDE_DIRECTORIES} ${CMAKE_SOURCE_DIR}/Lts/Common)
|
||||
|
||||
# The TrainingAreaBase tab plugins (tabPluginHla / tabPluginWlsTetra /
|
||||
# tabPluginDebugJsonDir / ...) declare Q_INTERFACES(TrainingAreaBase::Plugin::Plugin)
|
||||
# and include <TrainingAreaBase/tab_plugin_interface.h>. That include dir
|
||||
# (Lts/Proxies) is only a target-level INTERFACE include of tabPluginInterface and
|
||||
# is NOT part of the global include_directories that reach the AutogenInfo
|
||||
# MOC_INCLUDES, so moc fails with "Undefined interface". Add the Lts/Proxies root
|
||||
# explicitly so moc can resolve the interface. Must be set at root scope - subdir
|
||||
# appends do not reach the AutogenInfo MOC_INCLUDES.
|
||||
SET(CMAKE_AUTOMOC_INCLUDE_DIRECTORIES ${CMAKE_AUTOMOC_INCLUDE_DIRECTORIES} ${CMAKE_SOURCE_DIR}/Lts/Proxies)
|
||||
|
||||
# Designer plugins (ltswidgetsplugin) declare Q_INTERFACES(QDesignerCustomWidgetInterface)
|
||||
# and include <QtUiPlugin/QDesignerCustomWidgetInterface>. That interface's
|
||||
# Q_DECLARE_INTERFACE lives in the Qt6 QtUiPlugin module, which moc cannot resolve
|
||||
# without the Qt6 parent include dir (it is only a target-level INTERFACE include of
|
||||
# Qt6::UiTools and does not reach the global AutogenInfo MOC_INCLUDES). Add Qt6::Core's
|
||||
# interface include dirs (which expose the <QtModule>/header root) so moc finds the
|
||||
# interface. Must be set at root scope.
|
||||
get_target_property(_qt6_autmoc_incs Qt6::Core INTERFACE_INCLUDE_DIRECTORIES)
|
||||
SET(CMAKE_AUTOMOC_INCLUDE_DIRECTORIES ${CMAKE_AUTOMOC_INCLUDE_DIRECTORIES} ${_qt6_autmoc_incs})
|
||||
|
||||
# IMPORTED Targets für RTI Libraries erstellen
|
||||
# Debug und Release Varianten korrekt konfigurieren
|
||||
FOREACH(lib nddsc nddscore nddscpp nddscpp2 nddsctesthelpers)
|
||||
|
||||
Reference in new issue
Block a user