Qt6 migration verification: RTI 7.7 Pro integration and path fixes
Major changes: - Merged branches: feature/arcgis300-symbology-migration, feature/lts-viewer-validation-testing-phase, bugfix/fix-warning-issue - Integrated RTI 7.7 Pro commercial library with proper CMake configuration - Fixed all hardcoded /workspace paths to use /repo (Docker mount point) - Added DOCKER_MOUNT_ROOT parameter to new_docker_build.sh for configurable mount points - Fixed RPATH configuration for proper runtime library loading Technical fixes: - cmake/FindRTI.cmake: Set CMP0111 policy unconditionally, fixed IMPORTED_LOCATION property setting outside target creation block, added debug logging - CMakeLists.txt: Added CMP0111 before find_package(RTI), updated path detection for /repo, configured RPATH - Lts/DDS/CMakeLists.txt: Reordered DdsUnitTests before DdsUnitTestsPlaceholder to fix test executable naming - ArcGIS symbology: Removed deprecated m_sssResult and m_esriSwatchTaskUuid members (ArcGIS 300 API changes) Build verification: - 10 CPU build: 100% success (error fixing phase) - 1 CPU build: 100% success (final validation) - CTest: 675 tests run, 97% pass rate (654/675 passed) - RTI DDS integration test: PASSED Known issues: - 21 tests failed (mostly 'Not Run' for missing smoke test executables) - Timeout issues in bld_bsm_test and taboc_serialtest (connection refused errors) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
7 files changed
+86
-50
No files matched your search
@@ -4,8 +4,10 @@
|
||||
|
||||
set -e
|
||||
|
||||
ARCGIS_SRC="/workspace/external/ArcGIS"
|
||||
ARCGIS_DEST="/workspace/qt-migration-legatus/qt6-after/qt6-migrated-legatus/external/ArcGIS"
|
||||
# Use DOCKER_MOUNT_ROOT if set (supports both /repo and /workspace), default to /repo
|
||||
DOCKER_MOUNT_ROOT="${DOCKER_MOUNT_ROOT:-/repo}"
|
||||
ARCGIS_SRC="${DOCKER_MOUNT_ROOT}/external/ArcGIS"
|
||||
ARCGIS_DEST="${DOCKER_MOUNT_ROOT}/qt-migration-legatus/qt6-after/qt6-migrated-legatus/external/ArcGIS"
|
||||
|
||||
echo "=== ArcGIS SDK Setup ==="
|
||||
echo "Source: ${ARCGIS_SRC}"
|
||||
@@ -21,9 +23,12 @@ fi
|
||||
# Create destination directory if needed
|
||||
mkdir -p "$(dirname ${ARCGIS_DEST})"
|
||||
|
||||
# Remove existing symlink/directory if it exists
|
||||
if [ -e "${ARCGIS_DEST}" ]; then
|
||||
echo "Removing existing ArcGIS SDK at ${ARCGIS_DEST}"
|
||||
# Remove existing symlink/directory if it exists (check for symlink first)
|
||||
if [ -L "${ARCGIS_DEST}" ]; then
|
||||
echo "Removing existing ArcGIS SDK symlink at ${ARCGIS_DEST}"
|
||||
rm -f "${ARCGIS_DEST}"
|
||||
elif [ -e "${ARCGIS_DEST}" ]; then
|
||||
echo "Removing existing ArcGIS SDK directory at ${ARCGIS_DEST}"
|
||||
rm -rf "${ARCGIS_DEST}"
|
||||
fi
|
||||
|
||||
|
||||
Reference in new issue
Block a user