diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-26 18:05:42 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-26 18:05:42 +0100 |
| commit | 520ba7fd214b372e61d3e48d12bb1baab1c59d48 (patch) | |
| tree | b776d612ff819953edf551af320d03cf33f09e02 | |
| parent | 6dc109a8d248540c6674b863e3e4655d079528d8 (diff) | |
Crib CMake hack to allow debugging in OSX again.
| -rw-r--r-- | indra/newview/CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index d399f7d858..17a0e8d177 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -2049,7 +2049,12 @@ if (DARWIN) # These all get set with PROPERTIES set(product "Second Life") # this is the setting for the Python wrapper, see SL-322 and WRAPPER line in Info-SecondLife.plist - set(MACOSX_WRAPPER_EXECUTABLE_NAME "SL_Launcher") + 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_ICON_FILE "secondlife.icns") set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.secondlife.indra.viewer") |