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 c3f20a8861467bdf85322b184cf060c822d3b2c8 (commit)
via 53dbbaa907131c3302a037c3c8d2c1ca5eb19027 (commit)
from cc20b98859ecfaafe607d2bc2075ef71dde4a07d (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=c3f20a8861467bdf85322b184cf060c822d3b2c8
commit c3f20a8861467bdf85322b184cf060c822d3b2c8
Merge: cc20b98 53dbbaa
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Tue Mar 1 17:54:59 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Mar 1 17:54:59 2016 -0500
Merge topic 'bundle-utils-logic-fix' into next
53dbbaa9 BundleUtilities: Fix regression handling frameworks.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=53dbbaa907131c3302a037c3c8d2c1ca5eb19027
commit 53dbbaa907131c3302a037c3c8d2c1ca5eb19027
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Tue Mar 1 15:48:14 2016 -0700
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Tue Mar 1 15:52:33 2016 -0700
BundleUtilities: Fix regression handling frameworks.
Fix logic error introduced in e422f738.
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:
Modules/BundleUtilities.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
