diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-05 16:15:33 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-05 16:15:33 +0800 |
| commit | 1ed01f5134fa2e62fa447e9eb8c1745143b3779f (patch) | |
| tree | da33084480f38ccde7865c4b52ce248a4678b594 | |
| parent | 2775a604a0432132e251a74067d06a30f864523c (diff) | |
`make install` on macOS copies dep libs to bundle
I couldn't get CEF & Dullahan copied using this function.
fixup_bundle on SLPlugin.app was considered invalid, however, SLPlugin
itself gets install_name_tool changed but pointing to a non-existent
Frameworks directory that would be in the SLPlugin.app bundle.
We will have to create and fill such directory with links to the upper
(the root viewer app bundle Frameworks') library copies ourselves.
We wouldn't want fixup_bundle to successfully fill SLPlugin's Frameworks
with copies instead of links anyway.
See:
`man cmake-modules`
https://cmake.org/cmake/help/book/mastering-cmake/chapter/Install.html
| -rw-r--r-- | indra/newview/FixBundle.cmake.in | 7 | ||||
| -rw-r--r-- | indra/newview/ViewerInstall.cmake | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/FixBundle.cmake.in b/indra/newview/FixBundle.cmake.in new file mode 100644 index 0000000000..73806642e4 --- /dev/null +++ b/indra/newview/FixBundle.cmake.in @@ -0,0 +1,7 @@ +include(BundleUtilities) + +set(dirs + /opt/local/lib + ) + +fixup_bundle(${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app "" "${dirs}") diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake index 6c782592c9..7d9f160467 100644 --- a/indra/newview/ViewerInstall.cmake +++ b/indra/newview/ViewerInstall.cmake @@ -46,6 +46,12 @@ if (DARWIN) DESTINATION ${viewer_BINARY_DIR}/${VIEWER_CHANNEL}.app/Contents/Resources/app_settings ) + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/FixBundle.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/FixBundle.cmake + ) + install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/FixBundle.cmake) + else (DARWIN) install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_BINARY_NAME} |