Skip to content

Commit b157aa0

Browse files
committed
[SharedCache] Move plugin_rpath calls into BN_INTERNAL_BUILD blocks
These calls set the rpaths used for release builds of the dylibs using a macro that isn't available in the API repository. They are not necessary when building the shared cache plug-in outside of the context of the app.
1 parent 837049b commit b157aa0

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

view/kernelcache/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ if(BN_INTERNAL_BUILD)
4747
set_target_properties(kernelcache PROPERTIES
4848
LIBRARY_OUTPUT_DIRECTORY ${BN_CORE_PLUGIN_DIR}
4949
RUNTIME_OUTPUT_DIRECTORY ${BN_CORE_PLUGIN_DIR})
50+
plugin_rpath(kernelcache)
5051
else()
5152
set_target_properties(kernelcache PROPERTIES
5253
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/out/plugins
@@ -66,7 +67,6 @@ target_include_directories(kernelcache PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMA
6667

6768
target_link_libraries(kernelcache PUBLIC kernelcacheapi binaryninjaapi kernelcachecore) # kernelcacheworkflow)
6869

69-
plugin_rpath(kernelcache)
7070

7171

7272
set(COMPILE_DEFS "")

view/kernelcache/ui/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ if(BN_INTERNAL_BUILD)
4545
set_target_properties(kernelcacheui PROPERTIES
4646
LIBRARY_OUTPUT_DIRECTORY ${BN_CORE_PLUGIN_DIR}
4747
RUNTIME_OUTPUT_DIRECTORY ${BN_CORE_PLUGIN_DIR})
48+
ui_plugin_rpath(kernelcacheui)
4849
else()
4950
set_target_properties(kernelcacheui PROPERTIES
5051
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/out/plugins
@@ -93,5 +94,4 @@ target_include_directories(kernelcacheui PRIVATE ${INCLUDES})
9394

9495
target_link_libraries(kernelcacheui kernelcacheapi kernelcache binaryninjaui Qt6::Core Qt6::Gui Qt6::Widgets)
9596

96-
ui_plugin_rpath(kernelcacheui)
9797

view/sharedcache/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ if(BN_INTERNAL_BUILD)
4848
set_target_properties(sharedcache PROPERTIES
4949
LIBRARY_OUTPUT_DIRECTORY ${BN_CORE_PLUGIN_DIR}
5050
RUNTIME_OUTPUT_DIRECTORY ${BN_CORE_PLUGIN_DIR})
51+
plugin_rpath(sharedcache)
5152
else()
5253
set_target_properties(sharedcache PROPERTIES
5354
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/out/plugins
@@ -68,9 +69,6 @@ target_include_directories(sharedcache PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMA
6869

6970
target_link_libraries(sharedcache PUBLIC sharedcacheapi binaryninjaapi sharedcachecore sharedcacheworkflow)
7071

71-
plugin_rpath(sharedcache)
72-
73-
7472
set(COMPILE_DEFS "")
7573

7674
if (HARD_FAIL_MODE)

view/sharedcache/ui/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ if(BN_INTERNAL_BUILD)
4545
set_target_properties(sharedcacheui PROPERTIES
4646
LIBRARY_OUTPUT_DIRECTORY ${BN_CORE_PLUGIN_DIR}
4747
RUNTIME_OUTPUT_DIRECTORY ${BN_CORE_PLUGIN_DIR})
48+
ui_plugin_rpath(sharedcacheui)
4849
else()
4950
set_target_properties(sharedcacheui PROPERTIES
5051
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/out/plugins
@@ -94,5 +95,4 @@ target_include_directories(sharedcacheui PRIVATE ${INCLUDES})
9495

9596
target_link_libraries(sharedcacheui sharedcacheapi sharedcache binaryninjaui Qt6::Core Qt6::Gui Qt6::Widgets)
9697

97-
ui_plugin_rpath(sharedcacheui)
9898

0 commit comments

Comments
 (0)