diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-07 12:05:00 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-07 12:05:00 +0800 |
| commit | faa8e3bc698ed3eb2ff21d08b8a3d093ab12ff6c (patch) | |
| tree | b362d0ee661670d1e9d03508411e97346e3df7ed /indra/newview/FixBundle.cmake.in | |
| parent | dedf76e3f1eaebd053f193e92d6ffa3824a92c95 (diff) | |
Link CEF & chmod a+x Dullahan execs after install
otherwise fixup_bundle would try to fix DullahanHelper executables
when otool -L somehow can't find files that contain spaces in their
names. By postponing the chmod until after fixup_bundle is called,
fixup_bundle will ignore the DullahanHelper apps since they contain
no executables yet by that time.
Apart from that, trying to link to CEF would fail before installation
cause SLPlugin's Frameworks directory wouldn't exist yet.
Diffstat (limited to 'indra/newview/FixBundle.cmake.in')
| -rw-r--r-- | indra/newview/FixBundle.cmake.in | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in index 73806642e4..08da5f5c0a 100644 --- a/indra/newview/FixBundle.cmake.in +++ b/indra/newview/FixBundle.cmake.in @@ -5,3 +5,15 @@ set(dirs ) fixup_bundle(${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app "" "${dirs}") + +file(CREATE_LINK + "../../../../Frameworks/Chromium Embedded Framework.framework" + "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/Chromium Embedded Framework.framework" SYMBOLIC) + +file(CHMOD + "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/DullahanHelper.app/Contents/MacOS/DullahanHelper" + "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/DullahanHelper (GPU).app/Contents/MacOS/DullahanHelper (GPU)" + "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/DullahanHelper (Plugin).app/Contents/MacOS/DullahanHelper (Plugin)" + "${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/SLPlugin.app/Contents/Frameworks/DullahanHelper (Renderer).app/Contents/MacOS/DullahanHelper (Renderer)" + PERMISSIONS OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE + ) |