Merge feature/qt6-migration-basis-modules-merge-viewer-validation into feature/migrate-lts-projects-and-application
Cherry-picks5501d1e50(stub-header updates, superseded by4223ca2ffrelocation); resolves 1 content + 24 modify/delete conflicts; validates BUILD_RTI=ON BUILD_GRANTLEE=ON incl. Tools Groups 6-11.
This commit is contained in:
1295 files changed
+22136
-20217
No files matched your search
@@ -107,7 +107,12 @@ IF(NOT TARGET ArcGIS::ArcGIS)
|
||||
SET_PROPERTY(TARGET ArcGIS::ArcGIS PROPERTY IMPORTED_LOCATION "${ARCGIS_LIBRARY}")
|
||||
ENDIF()
|
||||
|
||||
SET_PROPERTY(TARGET ArcGIS::ArcGIS PROPERTY INTERFACE_INCLUDE_DIRECTORIES
|
||||
# APPEND (not replace): line 95 above set the ArcGIS SDK include dir; a plain
|
||||
# SET_PROPERTY here overwrote it, so consumers (e.g. advancedSymbology) never
|
||||
# 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>
|
||||
|
||||
Reference in new issue
Block a user