diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-08-22 17:11:10 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-08-22 17:11:10 -0400 |
| commit | 43d29ea03e39419e401db5fbe05cdb4e9364144f (patch) | |
| tree | c2c7273bb0d121d27ae5806cdb042cd2ba116ade /indra/newview/CMakeLists.txt | |
| parent | f78861c7bc355ddbcc3e942c41835a94070614c9 (diff) | |
| parent | d34e584b41ce317a942aa93e6217e678c88b9050 (diff) | |
merge changes for DRTVWR-202
Diffstat (limited to 'indra/newview/CMakeLists.txt')
| -rwxr-xr-x | indra/newview/CMakeLists.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 3cd03f8641..0031362210 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1955,6 +1955,12 @@ 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) + set(SIGNING_SETTING "") + endif (ENABLE_SIGNING) if (PACKAGE) add_custom_target(package ALL DEPENDS ${VIEWER_BINARY_NAME}) @@ -1974,6 +1980,7 @@ if (DARWIN) --login_channel=${VIEWER_LOGIN_CHANNEL} --source=${CMAKE_CURRENT_SOURCE_DIR} --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched + ${SIGNING_SETTING} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py ) |