Mount-independent GeographicLib rpath and DEB production fixes

- CMakeLists.txt: add a $ORIGIN-based CMAKE_BUILD_RPATH entry for the
  bundled GeographicLib (include/GeographicLib/lib), like the existing RTI
  entry. The imported GeographicLib target only contributed the absolute
  container mount path to the build RUNPATH, so binaries could not resolve
  libGeographicLib.so.26 outside the /repo mount. Verified: ddsview built
  and run in a container with a different mount prefix resolves it via
  $ORIGIN and starts (rc=0).
- new_docker_build.sh: seed the DEB cmake with ARCGIS_INCLUDE_DIR /
  ARCGIS_LIBRARY (the staged source copy cannot resolve the ArcGIS SDK,
  which is a relative symlink to the pipeline root dangling after
  staging); retry the build-tree removal with a clear error when a
  concurrent build/IDE keeps the directory busy.
- Dockerfile: add a late apt layer with devscripts + debhelper (debuild,
  dh) for the DEB flow; cached Qt/KDReports layers are preserved.
- README.md: document that --run-coverage and --run-jenkins-builder are
  combinable (DEB step runs after the coverage collection).
This commit is contained in:
berrux-dev committed 2026-11-20 13:26:28 +01:00
1 parent f1f2c5eec8
commit 113d4ab5ed
4 files changed
+47 -11

No files matched your search

@@ -51,6 +51,14 @@ SET(CMAKE_BUILD_RPATH "${CMAKE_BINARY_DIR}/lib")
SET(CMAKE_BUILD_RPATH
"${CMAKE_BUILD_RPATH};"
"$ORIGIN/../../../../external/rti_connext_dds-7.7.0/resource/app/lib/x64Linux4gcc8.5.0")
# GeographicLib is bundled in the tree (include/GeographicLib/lib). Add the
# $ORIGIN form so binaries resolve it relative to the build tree instead of
# the absolute container mount path (the imported target only provides the
# absolute dir). bin/ and lib/ sit at the same depth, so one entry serves
# both.
SET(CMAKE_BUILD_RPATH
"${CMAKE_BUILD_RPATH};"
"$ORIGIN/../../qt6-migrated-legatus/include/GeographicLib/lib")
SET(CMAKE_INSTALL_RPATH "${CMAKE_BINARY_DIR}/lib")
SET(CMAKE_BUILD_RPATH_USE_ORIGIN ON)