diff options
| author | David Cole <david.cole@kitware.com> | 2012-10-23 22:10:28 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2012-10-23 22:10:28 (GMT) |
| commit | 89256e03cf641b0dc4984303c41f9927291a8b99 (patch) | |
| tree | de2db98e57ae4f103771ba0092ef7d6e14974606 /Modules/BundleUtilities.cmake | |
| parent | 02b993b1ca3fc569aca2af6b0cf7eb442b5b8e2a (diff) | |
| download | CMake-89256e03cf641b0dc4984303c41f9927291a8b99.zip CMake-89256e03cf641b0dc4984303c41f9927291a8b99.tar.gz CMake-89256e03cf641b0dc4984303c41f9927291a8b99.tar.bz2 | |
BundleUtilities: Use a more inclusive REGEX for frameworks (#13600)
Some frameworks might be built with the library right at the root
of the framework rather than down in a versioned sub-folder with
a symlink at the root.
Make one of the slashes in the REGEX optional so BundleUtilities
can still properly work with such frameworks ... even if they are
weird. ;-)
Thanks to Tobias Hieta for the bug report and for trying out the fix
before I pushed this commit.
Diffstat (limited to 'Modules/BundleUtilities.cmake')
| -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: |