`cpack -G Bundle` instead of `make install` on Mac

Root project finally renamed to Megapahit, which has a nice effect of
CPack: - Run preinstall target for: Megapahit
CPack: - Install project: Megapahit []
but it's really because CPack Bundle file couldn't be renamed via
CPACK_PACKAGE_NAME like on DEB, RPM, and FREEBSD.
CPack determines its own destination root folder, which is Resources
(I didn't find a way to set it to Contents).
fixup_bundle is now run on the .app deep inside CPack staging folders
so that the dependency copies will be included in the DMG.

1 files changed, 7 insertions, 8 deletions

diff --git a/indra/newview/ViewerInstall.cmake b/indra/newview/ViewerInstall.cmake
index b6e670d09b..9d828bfd85 100644
--- a/indra/newview/ViewerInstall.cmake
+++ b/indra/newview/ViewerInstall.cmake
@@ -22,7 +22,7 @@ if (DARWIN)
         skins
         tr.lproj
         zh-Hans.lproj
-        DESTINATION Resources
+        DESTINATION .
         )
 
     install(FILES
@@ -30,25 +30,24 @@ if (DARWIN)
         ${AUTOBUILD_INSTALL_DIR}/ca-bundle.crt
         cube.dae
         featuretable_mac.txt
-        secondlife.icns
-        DESTINATION Resources
+        DESTINATION .
         )
 
     install(FILES
         licenses-mac.txt
         RENAME licenses.txt
-        DESTINATION Resources
+        DESTINATION .
         )
 
     install(FILES
         ${SCRIPTS_DIR}/messages/message_template.msg
         ${SCRIPTS_DIR}/../etc/message.xml
-        DESTINATION Resources/app_settings
+        DESTINATION app_settings
         )
 
     install(DIRECTORY
         "${AUTOBUILD_INSTALL_DIR}/lib/release/Chromium Embedded Framework.framework"
-        DESTINATION Frameworks
+        DESTINATION ../Frameworks
         )
 
     install(DIRECTORY
@@ -56,13 +55,13 @@ if (DARWIN)
         "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (GPU).app"
         "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (Plugin).app"
         "${AUTOBUILD_INSTALL_DIR}/lib/release/DullahanHelper (Renderer).app"
-        DESTINATION Resources/SLPlugin.app/Contents/Frameworks
+        DESTINATION SLPlugin.app/Contents/Frameworks
         )
 
     if (NDOF)
         install(FILES
             "${AUTOBUILD_INSTALL_DIR}/lib/release/libndofdev.dylib"
-            DESTINATION Resources
+            DESTINATION .
             )
     endif ()