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:
1718 files changed
+126739
-18495
No files matched your search
+28
-21
@@ -4,34 +4,41 @@
|
||||
# $Author$
|
||||
#
|
||||
|
||||
# The GDAL-based ElevationMap module is not yet migrated to Qt6 (see the
|
||||
# commented-out entries in ../CMakeLists.txt). LtsElevation still needs an
|
||||
# ElevationMapManager, so build the compatibility stub that lives in the
|
||||
# src/ + include/ scaffolding (same API as the Qt5 class, no GDAL).
|
||||
NGL_ADD_LIBRARY(WS AAR HLA SV situationMapElevationMap SHARED
|
||||
${CMAKE_SOURCE_DIR}/src/Viewer/SituationMap/ElevationMap/elevation_map_manager.cpp
|
||||
# The header lives in include/Viewer/SituationMap/ElevationMap, apart from
|
||||
# the cpp. AUTOMOC only mocs headers that are target sources (or sit next
|
||||
# to one); MOC_INCLUDES merely feeds moc's own -I flags, not header
|
||||
# discovery. Listed explicitly, otherwise the vtable/staticMetaObject are
|
||||
# undefined and the link of libsituationMapElevationMap.so fails.
|
||||
${CMAKE_SOURCE_DIR}/include/Viewer/SituationMap/ElevationMap/elevation_map_manager.h
|
||||
# ElevationMap module. The legacy module is GDAL-backed; GDAL is not part of the
|
||||
# Qt6 / ArcGIS-300 toolchain. Per the established no-GDAL decision, elevation_map.cpp
|
||||
# is a no-GDAL stand-in (public API preserved; no DEM data loaded) while the rest of
|
||||
# the module (ElevationMapManager, line_of_sight_calculation) is the real, GDAL-free
|
||||
# Qt code. This lets the SituationMap layer (MapImpl/SightFanImpl/ElevationMapManager)
|
||||
# compile and link against the elevation API.
|
||||
|
||||
SET(Elevation_SRCS
|
||||
elevation_map.cpp
|
||||
elevation_map.h
|
||||
elevation_map_helper.h
|
||||
elevation_map_manager.cpp
|
||||
elevation_map_manager.h
|
||||
line_of_sight_calculation.cpp
|
||||
line_of_sight_calculation.h
|
||||
)
|
||||
|
||||
# The stub's ElevationMapManager is a Q_OBJECT class; without AUTOMOC the
|
||||
# moc symbols (staticMetaObject/vtable) are missing and the link of
|
||||
# libsituationMapElevationMap.so fails, cascading to every target that
|
||||
# links it (same pattern as LtsSessionDataDds).
|
||||
NGL_ADD_LIBRARY2(AAR SV WS HLA situationMapElevationMap SHARED ${Elevation_SRCS})
|
||||
set_target_properties(situationMapElevationMap PROPERTIES AUTOMOC ON)
|
||||
|
||||
NGL_TARGET_INCLUDE_DIRECTORIES(situationMapElevationMap
|
||||
PUBLIC
|
||||
# The stub cpp does #include "elevation_map_manager.h" - it lives in
|
||||
# include/Viewer/SituationMap/ElevationMap/, not next to the source.
|
||||
${CMAKE_SOURCE_DIR}/include/Viewer/SituationMap/ElevationMap
|
||||
${CMAKE_SOURCE_DIR}/include
|
||||
# Consumers include <ElevationMap/elevation_map.h> and the NGL-generated
|
||||
# <ElevationMap/situationmapelevationmap_export.h>; the parent source/binary
|
||||
# dirs put the ElevationMap/ subfolder (and the generated export header) on the path.
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/../
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../
|
||||
)
|
||||
NGL_TARGET_LINK_LIBRARIES(situationMapElevationMap
|
||||
PRIVATE
|
||||
situationMapCommon
|
||||
Qt6::Concurrent
|
||||
Qt6::Gui
|
||||
NGLLogger
|
||||
LtsCoordTrans
|
||||
PUBLIC
|
||||
Qt6::Core
|
||||
LtsUtilsCoreHeaderOnly
|
||||
)
|
||||
Reference in new issue
Block a user