Browse Source

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.
David Cole 13 years ago
parent
commit
89256e03cf
1 changed files with 1 additions and 1 deletions
  1. 1 1
      Modules/BundleUtilities.cmake

+ 1 - 1
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: