Move the build tree out of the source tree (fixed ../build)
The build directory is now a fixed 'build' next to the tree (qt6-after/build), not in-tree build4 / build4_<timestamp>_<pid> dirs. - CMakeLists: the $ORIGIN RTI RUNPATH entry is now 4 levels up from a bin/ or lib/ artifact (the build tree is one level shallower) - new_docker_build_release2.sh: BUILD_DIR is the fixed ../build; the DEB tar drops the ./build4* exclude (the build dir is outside the tree) - new_docker_build.sh: Docker mounts the tree's parent so ../build lands next to the tree on the host; in-container paths (cmake source, SRCROOT, deb_stage, rpms, staging tar) updated accordingly - rpmbuild/make_rpm_ubuntu26*.py: stale build4/ references now say build/ - README: build4 -> ../build in every snippet and doc line Verified: fresh full-scope configure + ninja all in qt6-after/build is green; ctest 20/22 (same 2 pre-existing out-of-scope failures as the previous baseline); RUNPATH carries the 4-level $ORIGIN entry and ddscore_unit_test runs with no LD_LIBRARY_PATH / RTI_LICENSE.
This commit is contained in:
1 parent
874efd4733
commit
dc2c3e358b
6 files changed
+56
-46
No files matched your search
@@ -49,12 +49,14 @@ SET(CMAKE_BUILD_RPATH "${CMAKE_BINARY_DIR}/lib")
|
||||
# The RTI Connext libraries live outside the tree (pipeline-root
|
||||
# external/rti_connext_dds-7.7.0). The absolute path CMake bakes into the
|
||||
# RUNPATH only resolves on the mount of the build host, so also add a
|
||||
# $ORIGIN-relative entry (5 levels up from any bin/ or lib/ artifact is
|
||||
# the pipeline root) so the binaries load under any mount point
|
||||
# (e.g. /workspace) without LD_LIBRARY_PATH.
|
||||
# $ORIGIN-relative entry (4 levels up from any bin/ or lib/ artifact is
|
||||
# the pipeline root: the build tree is <qt6-migration-legatus>/qt6-after/
|
||||
# build, so bin/ -> build -> qt6-after -> qt-migration-legatus -> root)
|
||||
# so the binaries load under any mount point (e.g. /workspace) without
|
||||
# LD_LIBRARY_PATH.
|
||||
SET(CMAKE_BUILD_RPATH
|
||||
"${CMAKE_BUILD_RPATH};"
|
||||
"$ORIGIN/../../../../../external/rti_connext_dds-7.7.0/resource/app/lib/x64Linux4gcc8.5.0")
|
||||
"$ORIGIN/../../../../external/rti_connext_dds-7.7.0/resource/app/lib/x64Linux4gcc8.5.0")
|
||||
SET(CMAKE_INSTALL_RPATH "${CMAKE_BINARY_DIR}/lib")
|
||||
SET(CMAKE_BUILD_RPATH_USE_ORIGIN ON)
|
||||
|
||||
|
||||
Reference in new issue
Block a user