[Cmake-commits] CMake branch, next, updated. v2.8.7-2158-g9d9a838

[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  9d9a838b2e83b29953f787ca1b0148e38874287a (commit)
       via  880139a6421649b9b3ff8048418cd556e7ddf2c1 (commit)
      from  72161887ffaca3b13fb253887b7d99935f437a58 (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=9d9a838b2e83b29953f787ca1b0148e38874287a
commit 9d9a838b2e83b29953f787ca1b0148e38874287a
Merge: 7216188 880139a
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Jan 19 20:10:59 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 19 20:10:59 2012 -0500

    Merge topic 'GetPrerequisites-rpath-OSX' into next
    
    880139a GetPrerequisites: Add support for @rpath on Mac OS X.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=880139a6421649b9b3ff8048418cd556e7ddf2c1
commit 880139a6421649b9b3ff8048418cd556e7ddf2c1
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Jan 19 18:10:01 2012 -0700
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Thu Jan 19 18:10:01 2012 -0700

    GetPrerequisites: Add support for @rpath on Mac OS X.
    
    Change to consider a library embedded if it is found in a subdirectory relative to the
    using executable/library.  Previous commit considered them local.
    This case is encountered when @rpath is used with framework libraries, which are inside a directory tree.

diff --git a/Modules/GetPrerequisites.cmake b/Modules/GetPrerequisites.cmake
index fbbaf9c..8761f40 100644
--- a/Modules/GetPrerequisites.cmake
+++ b/Modules/GetPrerequisites.cmake
@@ -478,12 +478,17 @@ function(gp_resolved_file_type original_file file exepath dirs type_var)
 
     if(NOT is_system)
       get_filename_component(original_path "${original_lower}" PATH)
-      string(LENGTH "${original_path}/" original_length)
-      string(LENGTH "${lower}" path_length)
-      if(${path_length} GREATER ${original_length})
-        string(SUBSTRING "${lower}" 0 ${original_length} path)
-        if("${original_path}/" STREQUAL "${path}")
-          set(is_local 1)
+      get_filename_component(path "${lower}" PATH)
+      if("${original_path}" STREQUAL "${path}")
+        set(is_local 1)
+      else()
+        string(LENGTH "${original_path}/" original_length)
+        string(LENGTH "${lower}" path_length)
+        if(${path_length} GREATER ${original_length})
+          string(SUBSTRING "${lower}" 0 ${original_length} path)
+          if("${original_path}/" STREQUAL "${path}")
+            set(is_embedded 1)
+          endif()
         endif()
       endif()
     endif()

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

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


hooks/post-receive
-- 
CMake