From 0c572b1343d1e98574b7bc46169947f2dd5a257d Mon Sep 17 00:00:00 2001 From: Mark Rowe Date: Tue, 29 Jul 2025 16:20:49 -0700 Subject: [Mac] Consistently specify rpaths for plug-ins C++ plug-ins now consistently use the `plugin_rpath` or `ui_plugin_rpath` macros to ensure they have `SKIP_BUILD_RPATH` set when building on Mac (i.e., no `LC_RPATH` is added). Rust plug-ins have their build.rs updated to only specify `-Wl,-rpath` when building for Linux. It is not needed on macOS. On macOS we instead explicitly specify an `@rpath`-relative install name. This doesn't change any behavior, but avoids leaving an absolute path as the library's install name and is consistent with CMake's behavior for C++ plug-ins. --- view/sharedcache/CMakeLists.txt | 2 ++ view/sharedcache/ui/CMakeLists.txt | 2 ++ 2 files changed, 4 insertions(+) (limited to 'view/sharedcache') diff --git a/view/sharedcache/CMakeLists.txt b/view/sharedcache/CMakeLists.txt index e84ada5e..b49f8df7 100644 --- a/view/sharedcache/CMakeLists.txt +++ b/view/sharedcache/CMakeLists.txt @@ -68,6 +68,8 @@ target_include_directories(sharedcache PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMA target_link_libraries(sharedcache PUBLIC sharedcacheapi binaryninjaapi sharedcachecore sharedcacheworkflow) +plugin_rpath(sharedcache) + set(COMPILE_DEFS "") diff --git a/view/sharedcache/ui/CMakeLists.txt b/view/sharedcache/ui/CMakeLists.txt index 4fc1a5d4..0de89f60 100644 --- a/view/sharedcache/ui/CMakeLists.txt +++ b/view/sharedcache/ui/CMakeLists.txt @@ -94,3 +94,5 @@ target_include_directories(sharedcacheui PRIVATE ${INCLUDES}) target_link_libraries(sharedcacheui sharedcacheapi sharedcache binaryninjaui Qt6::Core Qt6::Gui Qt6::Widgets) +ui_plugin_rpath(sharedcacheui) + -- cgit v1.3.1