summaryrefslogtreecommitdiff
path: root/indra/llcharacter/CMakeLists.txt
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-05-20 09:08:20 -0400
committerOz Linden <oz@lindenlab.com>2013-05-20 09:08:20 -0400
commit72e7269da376d660385f3c66ac2a25a5e50871ea (patch)
tree047bd9d1bf99fa8c308c379dd57758050aa5ef51 /indra/llcharacter/CMakeLists.txt
parent621085d553cccc4238d74886ca44bcefafddd7f1 (diff)
parent0ebcb7e3fd1452d42b5ca48139f99a4fd632d235 (diff)
merge changes for 3.5.2-release
Diffstat (limited to 'indra/llcharacter/CMakeLists.txt')
-rwxr-xr-x[-rw-r--r--]indra/llcharacter/CMakeLists.txt13
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/llcharacter/CMakeLists.txt b/indra/llcharacter/CMakeLists.txt
index a1712699eb..2573417b26 100644..100755
--- a/indra/llcharacter/CMakeLists.txt
+++ b/indra/llcharacter/CMakeLists.txt
@@ -16,6 +16,10 @@ include_directories(
${LLVFS_INCLUDE_DIRS}
${LLXML_INCLUDE_DIRS}
)
+include_directories(SYSTEM
+ ${LLCOMMON_SYSTEM_INCLUDE_DIRS}
+ ${LLXML_SYSTEM_INCLUDE_DIRS}
+ )
set(llcharacter_SOURCE_FILES
llanimationstates.cpp
@@ -76,6 +80,15 @@ list(APPEND llcharacter_SOURCE_FILES ${llcharacter_HEADER_FILES})
add_library (llcharacter ${llcharacter_SOURCE_FILES})
+target_link_libraries(
+ llcharacter
+ ${LLCOMMON_LIBRARIES}
+ ${LLMATH_LIBRARIES}
+ ${LLMESSAGE_LIBRARIES}
+ ${LLVFS_LIBRARIES}
+ ${LLXML_LIBRARIES}
+ )
+
# Add tests
if (LL_TESTS)