diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-08-22 17:40:56 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-08-22 17:40:56 -0700 |
| commit | 3091af7aeecb5083a167bf87ce291cc8e821b963 (patch) | |
| tree | d8885a8d80ad4f061e984aa05ea4533e68c1a14b /indra/newview | |
| parent | 866c9d06395bceb383789f3cd224d23cee6a3d6e (diff) | |
| parent | fcfc686d9c4125c7bf35fcc97cb40b18dd9a4fc1 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 753dbd7438..3cd03f8641 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -45,7 +45,10 @@ include(VisualLeakDetector) include(GLOD) include(CMakeCopyIfDifferent) -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} |