diff options
| author | Brad King <brad.king@kitware.com> | 2012-11-06 19:13:28 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-11-06 19:13:28 (GMT) |
| commit | b24ebfa1570275929c047c2fcac3f358f926c8ca (patch) | |
| tree | ec059e03243327b93fff255f7d08cd190e8cd944 /Modules | |
| parent | a574752f8471dbbc7701afa37c895538a201082c (diff) | |
| parent | 89256e03cf641b0dc4984303c41f9927291a8b99 (diff) | |
| download | CMake-b24ebfa1570275929c047c2fcac3f358f926c8ca.zip CMake-b24ebfa1570275929c047c2fcac3f358f926c8ca.tar.gz CMake-b24ebfa1570275929c047c2fcac3f358f926c8ca.tar.bz2 | |
Merge topic 'fix-13600-better-framework-regex'
89256e0 BundleUtilities: Use a more inclusive REGEX for frameworks (#13600)
Diffstat (limited to 'Modules')
| -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 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: |