Commit 4e700cbf authored by Aron Helser's avatar Aron Helser Committed by Kitware Robot
Browse files

Merge topic 'mac_bundle_plugin_ignore'

a9cec5ac

 When bundling for apple, plugins and modules of app should ignore

Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !509
parents d49d5d60 a9cec5ac
Pipeline #287647 failed with stage
...@@ -847,11 +847,11 @@ def main(args): ...@@ -847,11 +847,11 @@ def main(args):
_install_binary(main_exe, is_excluded, bundle_dest, installed, manifest, dry_run=opts.dry_run, library_dest=opts.library_dest, framework_dest=opts.framework_dest) _install_binary(main_exe, is_excluded, bundle_dest, installed, manifest, dry_run=opts.dry_run, library_dest=opts.library_dest, framework_dest=opts.framework_dest)
for plugin in opts.plugins: for plugin in opts.plugins:
plugin_bin = Plugin(plugin, fake_exe_path=opts.fake_plugin_paths, search_paths=opts.search) plugin_bin = Plugin(plugin, fake_exe_path=opts.fake_plugin_paths, search_paths=opts.search, ignores=ignores)
_install_binary(plugin_bin, is_excluded, bundle_dest, installed, manifest, dry_run=opts.dry_run, library_dest=opts.library_dest, framework_dest=opts.framework_dest) _install_binary(plugin_bin, is_excluded, bundle_dest, installed, manifest, dry_run=opts.dry_run, library_dest=opts.library_dest, framework_dest=opts.framework_dest)
for library in opts.libraries: for library in opts.libraries:
library_bin = Module(library, 'Contents/Libraries', search_paths=opts.search) library_bin = Module(library, 'Contents/Libraries', search_paths=opts.search, ignores=ignores)
_install_binary(library_bin, is_excluded, bundle_dest, installed, manifest, dry_run=opts.dry_run) _install_binary(library_bin, is_excluded, bundle_dest, installed, manifest, dry_run=opts.dry_run)
library_bin.set_installed_id('@executable_path/../Libraries') library_bin.set_installed_id('@executable_path/../Libraries')
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment