[Cmake-commits] CMake branch, next, updated. v2.8.3-704-ge7f6e52

[Clinton Stimpson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  e7f6e52aace65c84499c49a59d370b5069cca70d (commit)
       via  28c1be7a504c45d1a030c2d982a03b4e1cf7251b (commit)
      from  5b1b47d703f88d8a65aab4a1a196b727b9eb0f67 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e7f6e52aace65c84499c49a59d370b5069cca70d
commit e7f6e52aace65c84499c49a59d370b5069cca70d
Merge: 5b1b47d 28c1be7
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue Nov 23 18:06:38 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 23 18:06:38 2010 -0500

    Merge topic 'bundleutils-rpath-removal' into next
    
    28c1be7 BundleUtilities: only do rpath strip on copied prerequisites.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=28c1be7a504c45d1a030c2d982a03b4e1cf7251b
commit 28c1be7a504c45d1a030c2d982a03b4e1cf7251b
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue Nov 23 14:29:46 2010 -0700
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Tue Nov 23 14:29:46 2010 -0700

    BundleUtilities: only do rpath strip on copied prerequisites.

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)
 
 

-----------------------------------------------------------------------

Summary of changes:
 Modules/BundleUtilities.cmake |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake