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
@@ -112,12 +112,27 @@ IF(NOT TARGET ArcGIS::ArcGIS)
|
||||
# saw <Symbol.h> etc. Base-state defect carried over from the legacy Qt5 file
|
||||
# (identical overwrite of the Qt5 include dirs), never surfaced because the
|
||||
# ArcGIS-ON GROUP5 path was never validated in this pipeline.
|
||||
SET_PROPERTY(TARGET ArcGIS::ArcGIS APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
|
||||
$<TARGET_PROPERTY:Qt6::Core,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
$<TARGET_PROPERTY:Qt6::Location,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
$<TARGET_PROPERTY:Qt6::Network,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
$<TARGET_PROPERTY:Qt6::Sensors,INTERFACE_INCLUDE_DIRECTORIES>
|
||||
)
|
||||
#
|
||||
# Only propagate the include dirs of Qt6 component targets that actually exist.
|
||||
# On a reconfigure the top-level find_package(Qt6 ... Positioning ...) is
|
||||
# short-circuited by the cached Qt6_*_DIR values, so the Qt6::Location /
|
||||
# Qt6::Sensors imported targets are NOT re-created even though the components
|
||||
# are "found" (Qt6Location_DIR/Qt6Sensors_DIR stay cached). A bare
|
||||
# $<TARGET_PROPERTY:Qt6::Location,...> on a missing target is a hard
|
||||
# "target not found" error at generate time. Guarding on TARGET keeps the
|
||||
# interface complete whenever the targets exist and skips them (instead of
|
||||
# crashing) when a reconfigure left them absent.
|
||||
SET(_arcgis_qt6_incs "")
|
||||
FOREACH(_arcgis_qt6_comp Core Location Network Sensors)
|
||||
IF(TARGET Qt6::${_arcgis_qt6_comp})
|
||||
LIST(APPEND _arcgis_qt6_incs
|
||||
$<TARGET_PROPERTY:Qt6::${_arcgis_qt6_comp},INTERFACE_INCLUDE_DIRECTORIES>)
|
||||
ENDIF()
|
||||
ENDFOREACH()
|
||||
IF(_arcgis_qt6_incs)
|
||||
SET_PROPERTY(TARGET ArcGIS::ArcGIS APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
|
||||
${_arcgis_qt6_incs})
|
||||
ENDIF()
|
||||
|
||||
IF (UNIX)
|
||||
IF(ARCGIS_COMMON_LIBRARY_RELEASE)
|
||||
|
||||
Reference in new issue
Block a user