diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-08-21 09:30:55 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-08-21 09:30:55 -0400 |
| commit | 822dc1c580bc538b233132935639ee7574fe7186 (patch) | |
| tree | 14736035713813b841d04ce4e6e11493318cf4a0 /indra | |
| parent | e7b378f0f1f9b1cc2c1dcba809484a177338de64 (diff) | |
storm-1906: correct cmake error when using precompiled llphysicsextensions_tpv
Diffstat (limited to 'indra')
| -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} |