summaryrefslogtreecommitdiff
path: root/indra/llxml
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2012-12-11 16:38:10 -0500
committerLogan Dethrow <log@lindenlab.com>2012-12-11 16:38:10 -0500
commit03025733484f7f1ea46d0356e65b0d142bc1dbdb (patch)
treed48902f9fab2fdc4d15850ffee3d6860f550bcb4 /indra/llxml
parentedcdce226a7ff599e43c89fe7e4d37350650ae96 (diff)
parent798377b076fbce895ba2075417107de0da10b9ca (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'indra/llxml')
-rw-r--r--indra/llxml/CMakeLists.txt10
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/llxml/CMakeLists.txt b/indra/llxml/CMakeLists.txt
index beefcda361..cf96f26a77 100644
--- a/indra/llxml/CMakeLists.txt
+++ b/indra/llxml/CMakeLists.txt
@@ -13,6 +13,9 @@ include_directories(
${LLMATH_INCLUDE_DIRS}
${LLVFS_INCLUDE_DIRS}
)
+include_directories(
+ ${LLCOMMON_SYSTEM_INCLUDE_DIRS}
+ )
set(llxml_SOURCE_FILES
llcontrol.cpp
@@ -39,9 +42,10 @@ list(APPEND llxml_SOURCE_FILES ${llxml_HEADER_FILES})
add_library (llxml ${llxml_SOURCE_FILES})
# Libraries on which this library depends, needed for Linux builds
# Sort by high-level to low-level
-target_link_libraries( llxml
- llvfs
- llmath
+target_link_libraries(llxml
+ ${LLVFS_LIBRARIES}
+ ${LLMATH_LIBRARIES}
+ ${LLCOMMON_LIBRARIES}
${EXPAT_LIBRARIES}
)