BundleUtilities: only do rpath strip on copied prerequisites.
This commit is contained in:
parent
a0739ac5ab
commit
28c1be7a50
|
@ -472,11 +472,11 @@ function(copy_resolved_item_into_bundle resolved_item resolved_embedded_item)
|
||||||
else()
|
else()
|
||||||
#message(STATUS "copying COMMAND ${CMAKE_COMMAND} -E copy ${resolved_item} ${resolved_embedded_item}")
|
#message(STATUS "copying COMMAND ${CMAKE_COMMAND} -E copy ${resolved_item} ${resolved_embedded_item}")
|
||||||
execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${resolved_item}" "${resolved_embedded_item}")
|
execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${resolved_item}" "${resolved_embedded_item}")
|
||||||
endif()
|
|
||||||
|
|
||||||
if(UNIX AND NOT APPLE)
|
if(UNIX AND NOT APPLE)
|
||||||
file(RPATH_REMOVE FILE "${resolved_embedded_item}")
|
file(RPATH_REMOVE FILE "${resolved_embedded_item}")
|
||||||
endif(UNIX AND NOT APPLE)
|
endif(UNIX AND NOT APPLE)
|
||||||
|
endif()
|
||||||
|
|
||||||
endfunction(copy_resolved_item_into_bundle)
|
endfunction(copy_resolved_item_into_bundle)
|
||||||
|
|
||||||
|
|
||||||
|
@ -514,11 +514,11 @@ function(copy_resolved_framework_into_bundle resolved_item resolved_embedded_ite
|
||||||
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory "${resolved_resources}" "${resolved_embedded_resources}")
|
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory "${resolved_resources}" "${resolved_embedded_resources}")
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
|
||||||
|
|
||||||
if(UNIX AND NOT APPLE)
|
if(UNIX AND NOT APPLE)
|
||||||
file(RPATH_REMOVE FILE "${resolved_embedded_item}")
|
file(RPATH_REMOVE FILE "${resolved_embedded_item}")
|
||||||
endif(UNIX AND NOT APPLE)
|
endif(UNIX AND NOT APPLE)
|
||||||
|
endif()
|
||||||
|
|
||||||
endfunction(copy_resolved_framework_into_bundle)
|
endfunction(copy_resolved_framework_into_bundle)
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue