[Cmake-commits] CMake branch, next, updated. v2.8.10-660-g2b4f3d8

[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  2b4f3d8c8b8cf49e5c5d588188cf11075b363ca7 (commit)
       via  89256e03cf641b0dc4984303c41f9927291a8b99 (commit)
      from  28ce089333320de4bc0c04826935c297f17b4004 (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=2b4f3d8c8b8cf49e5c5d588188cf11075b363ca7
commit 2b4f3d8c8b8cf49e5c5d588188cf11075b363ca7
Merge: 28ce089 89256e0
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Oct 31 16:42:51 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 31 16:42:51 2012 -0400

    Merge topic 'fix-13600-better-framework-regex' into next
    
    89256e0 BundleUtilities: Use a more inclusive REGEX for frameworks (#13600)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=89256e03cf641b0dc4984303c41f9927291a8b99
commit 89256e03cf641b0dc4984303c41f9927291a8b99
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Oct 23 18:10:28 2012 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Tue Oct 23 18:10:28 2012 -0400

    BundleUtilities: Use a more inclusive REGEX for frameworks (#13600)
    
    Some frameworks might be built with the library right at the root
    of the framework rather than down in a versioned sub-folder with
    a symlink at the root.
    
    Make one of the slashes in the REGEX optional so BundleUtilities
    can still properly work with such frameworks ... even if they are
    weird. ;-)
    
    Thanks to Tobias Hieta for the bug report and for trying out the fix
    before I pushed this commit.

diff --git a/Modules/BundleUtilities.cmake b/Modules/BundleUtilities.cmake
index 4557be6..0f6cd05 100644
--- a/Modules/BundleUtilities.cmake
+++ b/Modules/BundleUtilities.cmake
@@ -369,7 +369,7 @@ function(set_bundle_key_values keys_var context item exepath dirs copyflag)
       # For frameworks, construct the name under the embedded path from the
       # opening "${item_name}.framework/" to the closing "/${item_name}":
       #
-      string(REGEX REPLACE "^.*(${item_name}.framework/.*/${item_name}).*$" "${default_embedded_path}/\\1" embedded_item "${item}")
+      string(REGEX REPLACE "^.*(${item_name}.framework/.*/?${item_name}).*$" "${default_embedded_path}/\\1" embedded_item "${item}")
     else()
       # For other items, just use the same name as the original, but in the
       # embedded path:

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

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


hooks/post-receive
-- 
CMake