Skip to content

Commit

Permalink
Fix bug in deploying libs already in framework dir
Browse files Browse the repository at this point in the history
  • Loading branch information
ToKiNoBug committed Nov 20, 2023
1 parent d044b4b commit 8c0d0c4
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions DylibDeployer.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -493,16 +493,18 @@ function(DylibD_deploy_libs bin_location)
endif()

if((EXISTS ${resolved}) AND (${resolved} MATCHES ${DDdl_FRAMEWORK_DIR}))
continue()
# The dependency exists in framework dir, we don't need to fix install name for it.
# However we still need to deploy deps for ${resolved}
else()
DylibD_fix_install_name(${bin_location}
INSTALL_NAME ${iname}
FRAMEWORK_DIR ${DDdl_FRAMEWORK_DIR}
RPATH_POLICY ${DDdl_RPATH_POLICY}
RPATH ${DDdl_RPATH}
OUT_DEPLOYED_FILE deployed_file
)
endif()

DylibD_fix_install_name(${bin_location}
INSTALL_NAME ${iname}
FRAMEWORK_DIR ${DDdl_FRAMEWORK_DIR}
RPATH_POLICY ${DDdl_RPATH_POLICY}
RPATH ${DDdl_RPATH}
OUT_DEPLOYED_FILE deployed_file
)
if(NOT EXISTS ${deployed_file})
message(FATAL_ERROR "${bin_filename} requires \"${deployed_file}\" but it is not deployed. install name = \"${iname}\"")
continue()
Expand Down

0 comments on commit 8c0d0c4

Please sign in to comment.