diff options
| author | Don Kjer <don@lindenlab.com> | 2012-09-03 20:12:47 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-09-03 20:12:47 +0000 |
| commit | 403d1b6404355fa26b0bfeff206f5c56758a491c (patch) | |
| tree | 6438eb8fa29dc8946d404ac79f89cf1bd140bbe1 /indra/newview/CMakeLists.txt | |
| parent | 21c364c4d455cc05ec176032e8c090be0cc4ed50 (diff) | |
| parent | 825cc7873251ad90720ab40221d689abed7b2ac8 (diff) | |
Merge VirLinden/sunshine -> don_linden/sunshine-experimental
Diffstat (limited to 'indra/newview/CMakeLists.txt')
| -rwxr-xr-x | indra/newview/CMakeLists.txt | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index a40f7cd3d3..214071fa67 100755 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -46,7 +46,10 @@ include(GLOD) include(CMakeCopyIfDifferent) include(LLAppearance) -add_subdirectory(${LLPHYSICSEXTENSIONS_SRC_DIR} llphysicsextensions) +if (NOT HAVOK_TPV) + # When using HAVOK_TPV, the library is precompiled, so no need for this + add_subdirectory(${LLPHYSICSEXTENSIONS_SRC_DIR} llphysicsextensions) +endif (NOT HAVOK_TPV) include_directories( ${DBUSGLIB_INCLUDE_DIRS} @@ -1943,6 +1946,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}) @@ -1962,6 +1971,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 ) |