Skip to content
Snippets Groups Projects
Commit aaf45f0f authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

DRTVWR-474, MAINT-9047: Set viewer name in Info.plist, not launcher.

parent e3d16dcb
No related branches found
No related tags found
No related merge requests found
...@@ -2056,13 +2056,7 @@ endif (LINUX) ...@@ -2056,13 +2056,7 @@ endif (LINUX)
if (DARWIN) if (DARWIN)
# These all get set with PROPERTIES # These all get set with PROPERTIES
set(product "Second Life") set(product "Second Life")
# this is the setting for the Python wrapper, see SL-322 and WRAPPER line in Info-SecondLife.plist set(MACOSX_EXECUTABLE_NAME "Second Life")
if (PACKAGE)
set(MACOSX_WRAPPER_EXECUTABLE_NAME "SL_Launcher")
else (PACKAGE)
# force the name of the actual executable to allow running it within Xcode for debugging
set(MACOSX_WRAPPER_EXECUTABLE_NAME "../Resources/Second Life Viewer.app/Contents/MacOS/Second Life")
endif (PACKAGE)
set(MACOSX_BUNDLE_INFO_STRING "Second Life Viewer") set(MACOSX_BUNDLE_INFO_STRING "Second Life Viewer")
set(MACOSX_BUNDLE_ICON_FILE "secondlife.icns") set(MACOSX_BUNDLE_ICON_FILE "secondlife.icns")
set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.secondlife.indra.viewer") set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.secondlife.indra.viewer")
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key> <key>CFBundleDevelopmentRegion</key>
<string>English</string> <string>English</string>
<key>CFBundleExecutable</key> <key>CFBundleExecutable</key>
<string>${MACOSX_WRAPPER_EXECUTABLE_NAME}</string> <string>${MACOSX_EXECUTABLE_NAME}</string>
<key>CFBundleGetInfoString</key> <key>CFBundleGetInfoString</key>
<string>${MACOSX_BUNDLE_INFO_STRING}</string> <string>${MACOSX_BUNDLE_INFO_STRING}</string>
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment