[Cmake-commits] CMake branch, next, updated. v3.0.2-5696-g2317f45

[Brad King]

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  2317f454c3544d4c206d0a9a4c6d3fae55f4ec57 (commit)
       via  ecbd93b706e4e131faed35337ca79bf48efbc337 (commit)
      from  e5734b5b08b7e5e6376b332d9de121aa6bb38282 (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=2317f454c3544d4c206d0a9a4c6d3fae55f4ec57
commit 2317f454c3544d4c206d0a9a4c6d3fae55f4ec57
Merge: e5734b5 ecbd93b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 9 11:18:12 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 9 11:18:12 2014 -0400

    Merge topic 'fix-OSX-bundle-rpaths-and-Qt5' into next
    
    ecbd93b7 BundleUtilities: Check install_name_tool has -delete_rpath


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ecbd93b706e4e131faed35337ca79bf48efbc337
commit ecbd93b706e4e131faed35337ca79bf48efbc337
Author:     Adam Strzelecki <ono at java.pl>
AuthorDate: Thu Oct 9 17:11:05 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 9 11:17:54 2014 -0400

    BundleUtilities: Check install_name_tool has -delete_rpath
    
    Otherwise it will fail with Xcode 3.x on 10.5 which has no -delete_rpath option
    for install_name_tool command, that was first introduced in 10.6 SDK, even that
    10.5 supports LC_RPATH and @rpath.

diff --git a/Modules/BundleUtilities.cmake b/Modules/BundleUtilities.cmake
index eedab44..445c719 100644
--- a/Modules/BundleUtilities.cmake
+++ b/Modules/BundleUtilities.cmake
@@ -742,9 +742,17 @@ function(fixup_bundle_item resolved_embedded_item exepath dirs)
     execute_process(COMMAND chmod u+w "${resolved_embedded_item}")
   endif()
 
-  foreach(rpath ${${ikey}_RPATHS})
-    set(changes ${changes} -delete_rpath "${rpath}")
-  endforeach()
+  # Only if install_name_tool supports -delete_rpath:
+  #
+  execute_process(COMMAND install_name_tool
+    OUTPUT_VARIABLE install_name_tool_usage
+    ERROR_VARIABLE  install_name_tool_usage
+    )
+  if(install_name_tool_usage MATCHES ".*-delete_rpath.*")
+    foreach(rpath ${${ikey}_RPATHS})
+      set(changes ${changes} -delete_rpath "${rpath}")
+    endforeach()
+  endif()
 
   if(${ikey}_EMBEDDED_ITEM)
     set(changes ${changes} -id "${${ikey}_EMBEDDED_ITEM}")

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

Summary of changes:
 Modules/BundleUtilities.cmake |   14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake