diff options
| author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-08-01 14:07:24 -0700 |
|---|---|---|
| committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-08-01 14:07:24 -0700 |
| commit | b7555a3309bda8e9689627901051aa90fcb7be34 (patch) | |
| tree | bbb84478c302539f434bab7a620fe23456926236 /indra/llprimitive/CMakeLists.txt | |
| parent | 62379fd7628afa5ce1b104ff66b26821ce740c29 (diff) | |
| parent | 92a0db2a4f5397067e087068f736181e618e9c0a (diff) | |
Merge back viewer-lion, which has viewer-development and down-stream fixes
Diffstat (limited to 'indra/llprimitive/CMakeLists.txt')
| -rw-r--r-- | indra/llprimitive/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llprimitive/CMakeLists.txt b/indra/llprimitive/CMakeLists.txt index 7d0e313ff3..e4d9de7eb6 100644 --- a/indra/llprimitive/CMakeLists.txt +++ b/indra/llprimitive/CMakeLists.txt @@ -7,12 +7,14 @@ include(LLCommon) include(LLMath) include(LLMessage) include(LLXML) +include(LLPhysicsExtensions) include_directories( ${LLCOMMON_INCLUDE_DIRS} ${LLMATH_INCLUDE_DIRS} ${LLMESSAGE_INCLUDE_DIRS} ${LLXML_INCLUDE_DIRS} + ${LLPHYSICSEXTENSIONS_INCLUDE_DIRS} ${LIBS_PREBUILT_DIR}/include/collada ${LIBS_PREBUILT_DIR}/include/collada/1.4 ) |