[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-319-g38a68b7

[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  38a68b755cb47d6eb75b9717de7003394139c28f (commit)
       via  3906ca5af4ade1c8f57e4067b07fb03a305dd39d (commit)
      from  c3f20a8861467bdf85322b184cf060c822d3b2c8 (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=38a68b755cb47d6eb75b9717de7003394139c28f
commit 38a68b755cb47d6eb75b9717de7003394139c28f
Merge: c3f20a8 3906ca5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 7 09:31:11 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 7 09:31:11 2016 -0500

    Merge topic 'BundleUtilities-dylib-in-framework' into next
    
    3906ca5a BundleUtilities: Fix regression handling frameworks


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3906ca5af4ade1c8f57e4067b07fb03a305dd39d
commit 3906ca5af4ade1c8f57e4067b07fb03a305dd39d
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue Mar 1 15:48:14 2016 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 7 09:30:18 2016 -0500

    BundleUtilities: Fix regression handling frameworks
    
    Fix logic error introduced in commit e422f738 (BundleUtilities: Fix
    treatment of .dylib inside .framework folders, 2016-02-11).

diff --git a/Modules/BundleUtilities.cmake b/Modules/BundleUtilities.cmake
index 73ff0af..4b52afa 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 NOT MATCHES "\\.dylib$") AND (item MATCHES "[^/]+\\.framework/"))
+    if((NOT item 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:


hooks/post-receive
-- 
CMake