summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2009-07-01 17:55:03 -0400
committerNat Goodspeed <nat@lindenlab.com>2009-07-01 17:55:03 -0400
commitf68d3de9495d4a23a66ae61b1985e07694db4708 (patch)
tree392e241957077ba1064b28b596a7b24784a8c2cc /indra/llcommon
parentdc93fe6cc68115dd280881c0896fa3f0e8d46f2c (diff)
parent7c1742ec7d626ff34084624729b338f9abc58686 (diff)
Reconcile with Brad's changes before push
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/CMakeLists.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index ecb6c283db..06a295b410 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -7,11 +7,13 @@ include(LLAddBuildTest)
include(LLCommon)
include(Linking)
include(Boost)
+include (Pth)
include_directories(
${EXPAT_INCLUDE_DIRS}
${LLCOMMON_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS}
+ ${PTH_INCLUDE_DIRS}
)
# add_executable(lltreeiterators lltreeiterators.cpp)
@@ -24,7 +26,6 @@ set(llcommon_SOURCE_FILES
llallocator_heap_profile.cpp
llapp.cpp
llapr.cpp
- llaprsockstream.cpp
llassettype.cpp
llbase32.cpp
llbase64.cpp
@@ -102,7 +103,6 @@ set(llcommon_HEADER_FILES
llagentconstants.h
llapp.h
llapr.h
- llaprsockstream.h
llassettype.h
llassoclist.h
llavatarconstants.h
@@ -247,6 +247,7 @@ target_link_libraries(
${WINDOWS_LIBRARIES}
${BOOST_PROGRAM_OPTIONS_LIBRARY}
${BOOST_REGEX_LIBRARY}
+ ${PTH_LIBRARIES}
)
include(LLAddBuildTest)