diff --git a/.cmake/PostBuild.cmake b/.cmake/PostBuild.cmake index ab705bde7..2024cbfe9 100644 --- a/.cmake/PostBuild.cmake +++ b/.cmake/PostBuild.cmake @@ -21,7 +21,9 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin") endif() # copy boost and ffmpeg libraries (which can't be statically linked) to bin/ +# note this step also ensures libraries we depend upon have their rpath values +# so libraries are resolved to the local directory. if (${BUILD_STANDALONE} MATCHES "true") message(STATUS "[post-build] copying boost and ffmpeg libs...") - add_custom_command(TARGET postbuild POST_BUILD COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/script/stage-static-vendor-libraries.sh") + add_custom_command(TARGET postbuild POST_BUILD COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/script/stage-vendor-libraries.sh") endif() diff --git a/script/bootstrap-static-vendors.sh b/script/bootstrap-vendor-libraries.sh similarity index 100% rename from script/bootstrap-static-vendors.sh rename to script/bootstrap-vendor-libraries.sh diff --git a/script/stage-static-vendor-libraries.sh b/script/stage-vendor-libraries.sh similarity index 100% rename from script/stage-static-vendor-libraries.sh rename to script/stage-vendor-libraries.sh