瀏覽代碼

BundleUtilities: only do rpath strip on copied prerequisites.

Clinton Stimpson 15 年之前
父節點
當前提交
28c1be7a50
共有 1 個文件被更改,包括 6 次插入6 次删除
  1. 6 6
      Modules/BundleUtilities.cmake

+ 6 - 6
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)