diff options
| author | Ima Mechanique <ima.mechanique@secondlife.com> | 2013-02-05 16:37:37 +0000 |
|---|---|---|
| committer | Ima Mechanique <ima.mechanique@secondlife.com> | 2013-02-05 16:37:37 +0000 |
| commit | 7183cecd14fbdc3cd31e1482248fabec7b23b1fb (patch) | |
| tree | 9f07e2451567e217de1238af2cb4afbe568c9498 /indra/newview/CMakeLists.txt | |
| parent | 1407f4f11a911d1853114af5c140d3fa0b73f14a (diff) | |
STORM-1831 merging in previous work
Diffstat (limited to 'indra/newview/CMakeLists.txt')
| -rwxr-xr-x | indra/newview/CMakeLists.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index dff2c04fbc..cbeb0c43a4 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1467,7 +1467,8 @@ set(viewer_APPSETTINGS_FILES app_settings/high_graphics.xml app_settings/ignorable_dialogs.xml app_settings/keys.xml - app_settings/keywords.ini + app_settings/keywords_lsl_colors.xml + app_settings/keywords_lsl_tokens.xml app_settings/logcontrol.xml app_settings/low_graphics.xml app_settings/mid_graphics.xml @@ -1785,7 +1786,7 @@ elseif (DARWIN) LINK_FLAGS_RELEASE "${LINK_FLAGS_RELEASE} -Xlinker -dead_strip -Xlinker -map -Xlinker ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_BINARY_NAME}.MAP" ) else (WINDOWS) - # Linux + # Linux set_target_properties(${VIEWER_BINARY_NAME} PROPERTIES LINK_FLAGS_RELEASE "${LINK_FLAGS_RELEASE} -Wl,--Map=${VIEWER_BINARY_NAME}.MAP" @@ -1961,7 +1962,7 @@ if (DARWIN) ) add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit mac-updater mac-crash-logger) - + if (ENABLE_SIGNING) set(SIGNING_SETTING "--signature=${SIGNING_IDENTITY}") else (ENABLE_SIGNING) |