[Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-106-gf90cc17

[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  f90cc170a03e7d7f695fcc93c5013ab69b023fc4 (commit)
       via  e422f738e4eb27dbf24a0b45d56e0f21a1d45cbc (commit)
      from  eb9e0d130321d0538e3d3cc3e373581f007995dc (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f90cc170a03e7d7f695fcc93c5013ab69b023fc4
commit f90cc170a03e7d7f695fcc93c5013ab69b023fc4
Merge: eb9e0d1 e422f73
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 11 08:51:02 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 11 08:51:02 2016 -0500

    Merge topic 'BundleUtilities-dylib-in-framework' into next
    
    e422f738 BundleUtilities: Fix treatment of .dylib inside .framework folders


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e422f738e4eb27dbf24a0b45d56e0f21a1d45cbc
commit e422f738e4eb27dbf24a0b45d56e0f21a1d45cbc
Author:     Christian Askeland <christian.askeland at gmail.com>
AuthorDate: Thu Feb 11 14:15:06 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 11 08:49:06 2016 -0500

    BundleUtilities: Fix treatment of .dylib inside .framework folders
    
    The specific cause is when e.g.
    
        /Library/Frameworks/GStreamer.framework/Versions/1.0/lib/libgio-2.0.0.dylib
    
    is detected by fixup_bundle.  set_bundle_key_values() interprets this as
    a framework, thus doing a string replace that creates an embedded_item
    that is equal to the original path, i.e. it is not embedded.

diff --git a/Modules/BundleUtilities.cmake b/Modules/BundleUtilities.cmake
index 45dda40..73ff0af 100644
--- a/Modules/BundleUtilities.cmake
+++ b/Modules/BundleUtilities.cmake
@@ -479,7 +479,7 @@ function(set_bundle_key_values keys_var context item exepath dirs copyflag)
 
     get_item_rpaths("${resolved_item}" item_rpaths)
 
-    if(item MATCHES "[^/]+\\.framework/")
+    if((item NOT MATCHES "\\.dylib$") AND (item MATCHES "[^/]+\\.framework/"))
       # For frameworks, construct the name under the embedded path from the
       # opening "${item_name}.framework/" to the closing "/${item_name}":
       #

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

Summary of changes:
 Modules/BundleUtilities.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake