diff options
| author | Brad King <brad.king@kitware.com> | 2010-12-02 19:25:16 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-12-02 19:25:16 (GMT) |
| commit | 1060aaf08620469d7dcc1b44d36477493793f468 (patch) | |
| tree | d81cc3be2ca6d669c1e14c9b5f2a1fbe0c163593 | |
| parent | 6a07b22bf9d9f3b8384270d4a458238f370f734f (diff) | |
| parent | 28c1be7a504c45d1a030c2d982a03b4e1cf7251b (diff) | |
| download | CMake-1060aaf08620469d7dcc1b44d36477493793f468.zip CMake-1060aaf08620469d7dcc1b44d36477493793f468.tar.gz CMake-1060aaf08620469d7dcc1b44d36477493793f468.tar.bz2 | |
Merge topic 'bundleutils-rpath-removal'
28c1be7 BundleUtilities: only do rpath strip on copied prerequisites.
| -rw-r--r-- | Modules/BundleUtilities.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Modules/BundleUtilities.cmake b/Modules/BundleUtilities.cmake index c7ead5b..48830cb 100644 --- a/Modules/BundleUtilities.cmake +++ b/Modules/BundleUtilities.cmake @@ -472,11 +472,11 @@ function(copy_resolved_item_into_bundle resolved_item resolved_embedded_item) else() #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}") + if(UNIX AND NOT APPLE) + file(RPATH_REMOVE FILE "${resolved_embedded_item}") + endif(UNIX AND NOT APPLE) endif() - if(UNIX AND NOT APPLE) - file(RPATH_REMOVE FILE "${resolved_embedded_item}") - endif(UNIX AND NOT APPLE) 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}") endif() endif() + if(UNIX AND NOT APPLE) + file(RPATH_REMOVE FILE "${resolved_embedded_item}") + endif(UNIX AND NOT APPLE) endif() - if(UNIX AND NOT APPLE) - file(RPATH_REMOVE FILE "${resolved_embedded_item}") - endif(UNIX AND NOT APPLE) endfunction(copy_resolved_framework_into_bundle) |