From 6d11efa589dbe045890c2f3a5db8091833b0f1a3 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Fri, 17 Jan 2025 22:11:39 -0500 Subject: [PATCH] fix `rpath` issue for `mavsdk_server` macos build Signed-off-by: Rui Chen --- src/mavsdk_server/src/CMakeLists.txt | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/mavsdk_server/src/CMakeLists.txt b/src/mavsdk_server/src/CMakeLists.txt index 0a54dd7e3..9a2155008 100644 --- a/src/mavsdk_server/src/CMakeLists.txt +++ b/src/mavsdk_server/src/CMakeLists.txt @@ -112,14 +112,24 @@ if(NOT IOS AND NOT ANDROID) ) if (BUILD_SHARED_LIBS) - set_target_properties(mavsdk_server_bin PROPERTIES - INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}" + if (APPLE) + set_target_properties(mavsdk_server PROPERTIES + BUILD_WITH_INSTALL_RPATH ON + INSTALL_NAME_DIR "@rpath" + INSTALL_RPATH "@loader_path/../lib" ) - - set_target_properties(mavsdk_server - PROPERTIES - INSTALL_RPATH "$ORIGIN" - ) + set_target_properties(mavsdk_server_bin PROPERTIES + BUILD_WITH_INSTALL_RPATH ON + INSTALL_RPATH "@loader_path/../lib" + ) + else() + set_target_properties(mavsdk_server PROPERTIES + INSTALL_RPATH "$ORIGIN" + ) + set_target_properties(mavsdk_server_bin PROPERTIES + INSTALL_RPATH "${CMAKE_INSTALL_LIBDIR}" + ) + endif() endif() endif()