[Cmake-commits] CMake branch, next, updated. v2.8.2-695-g80c1bf5

[David Cole]

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  80c1bf5b25ae2af6f833631b6a954fb409e2ed57 (commit)
       via  88fed668b1a35f6bd1c0ab2cd4bc6f62576b9121 (commit)
      from  5b3c8e8f7ad977afae0fe6f9a2957c50a16f7c05 (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=80c1bf5b25ae2af6f833631b6a954fb409e2ed57
commit 80c1bf5b25ae2af6f833631b6a954fb409e2ed57
Merge: 5b3c8e8 88fed66
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Sep 7 22:53:26 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 7 22:53:26 2010 -0400

    Merge topic 'fix-9284' into next
    
    88fed66 Make bundle items writable before fixup (#9284)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=88fed668b1a35f6bd1c0ab2cd4bc6f62576b9121
commit 88fed668b1a35f6bd1c0ab2cd4bc6f62576b9121
Author:     Mike McQuaid <mike at mikemcquaid.com>
AuthorDate: Tue Sep 7 22:49:32 2010 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Tue Sep 7 22:49:32 2010 -0400

    Make bundle items writable before fixup (#9284)
    
    This ensures that any bundle items are made user writable before
    any attempt is made to alter them using install_name_tool. This is
    because MacPorts/Fink/Homebrew don't install libraries as writable.
    This fix is needed to allow fixup_bundle_item to work correctly
    when ingesting libraries installed by these package managers.

diff --git a/Modules/BundleUtilities.cmake b/Modules/BundleUtilities.cmake
index b48c61e..fad3b78 100644
--- a/Modules/BundleUtilities.cmake
+++ b/Modules/BundleUtilities.cmake
@@ -118,6 +118,9 @@
 # Accumulate changes in a local variable and make *one* call to
 # install_name_tool at the end of the function with all the changes at once.
 #
+# If the BU_CHMOD_BUNDLE_ITEMS variable is set then bundle items will be
+# marked writable before install_name_tool tries to change them.
+#
 #  VERIFY_BUNDLE_PREREQUISITES(<bundle> <result_var> <info_var>)
 # Verifies that the sum of all prerequisites of all files inside the bundle
 # are contained within the bundle or are "system" libraries, presumed to exist
@@ -541,6 +544,10 @@ function(fixup_bundle_item resolved_embedded_item exepath dirs)
     endif(NOT "${${rkey}_EMBEDDED_ITEM}" STREQUAL "")
   endforeach(pr)
 
+  if(BU_CHMOD_BUNDLE_ITEMS)
+    execute_process(COMMAND chmod u+w "${resolved_embedded_item}")
+  endif()
+
   # Change this item's id and all of its references in one call
   # to install_name_tool:
   #

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

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


hooks/post-receive
-- 
CMake