diff options
| author | Brad King <brad.king@kitware.com> | 2016-02-12 14:03:57 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-02-12 14:03:57 (GMT) |
| commit | 86d2f3252591f413e57a623e297911bbf03b481e (patch) | |
| tree | 48f864f34139ee7f7fb0dcfa250fca9fb446ecc8 | |
| parent | 10f03d1baab5721cdff0550bd39664a6d9cd941d (diff) | |
| parent | e422f738e4eb27dbf24a0b45d56e0f21a1d45cbc (diff) | |
| download | CMake-86d2f3252591f413e57a623e297911bbf03b481e.zip CMake-86d2f3252591f413e57a623e297911bbf03b481e.tar.gz CMake-86d2f3252591f413e57a623e297911bbf03b481e.tar.bz2 | |
Merge topic 'BundleUtilities-dylib-in-framework'
e422f738 BundleUtilities: Fix treatment of .dylib inside .framework folders
| -rw-r--r-- | Modules/BundleUtilities.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
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}": # |