diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2011-12-12 10:02:12 -0800 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2011-12-12 10:02:12 -0800 |
| commit | ec52f62228ada7cbf482b6b29d069faa0cebc670 (patch) | |
| tree | adfd8f867f38e8ad90befc0ce7c2f2c48bce3b3e /indra/newview | |
| parent | d3299410427015ef59683ce4ea33d807a936295c (diff) | |
Adding the ability to pull in the pathing library as a prebuilt dependency.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/CMakeLists.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index c998ab351c..c1fe1729e5 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -13,6 +13,7 @@ include(EXPAT) include(FMOD) include(OPENAL) include(FindOpenGL) +include(Havok) include(JsonCpp) include(LLAudio) include(LLCharacter) @@ -23,6 +24,7 @@ include(LLImageJ2COJ) include(LLInventory) include(LLMath) include(LLMessage) +include(LLPathingLib) include(LLPlugin) include(LLPrimitive) include(LLRender) @@ -52,6 +54,7 @@ include_directories( ${LLCHARACTER_INCLUDE_DIRS} ${LLCOMMON_INCLUDE_DIRS} ${LLCONVEXDECOMP_INCLUDE_DIRS} + ${LLPATHING_INCLUDE_DIRS} ${FMOD_INCLUDE_DIR} ${LLIMAGE_INCLUDE_DIRS} ${LLKDU_INCLUDE_DIRS} @@ -1739,6 +1742,8 @@ endif (WINDOWS) # To work around this, higher level modules should be listed before the modules # that they depend upon. -brad target_link_libraries(${VIEWER_BINARY_NAME} + ${LLPATHING_LIBRARIES} + ${HK_LIBRARIES} ${UPDATER_LIBRARIES} ${GOOGLE_PERFTOOLS_LIBRARIES} ${LLAUDIO_LIBRARIES} |