From 6da0725c3b75c24855537df877672595de8e56e6 Mon Sep 17 00:00:00 2001
From: brad <brad@lindenlab.com>
Date: Fri, 26 Jun 2009 15:10:53 -0400
Subject: Moved LLAPRSockStream out of llcommon into eventhost module so I can
 reenable its tests in the new world order.

---
 indra/llcommon/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/llcommon')

diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index ecb6c283db..4ba74ab837 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -24,7 +24,6 @@ set(llcommon_SOURCE_FILES
     llallocator_heap_profile.cpp
     llapp.cpp
     llapr.cpp
-    llaprsockstream.cpp
     llassettype.cpp
     llbase32.cpp
     llbase64.cpp
@@ -102,7 +101,6 @@ set(llcommon_HEADER_FILES
     llagentconstants.h
     llapp.h
     llapr.h
-    llaprsockstream.h
     llassettype.h
     llassoclist.h
     llavatarconstants.h
-- 
cgit v1.2.3


From 726ac3ed0f70900edbeeacece866a21ff90534d4 Mon Sep 17 00:00:00 2001
From: brad kittenbrink <brad@lindenlab.com>
Date: Tue, 30 Jun 2009 11:52:00 -0400
Subject: Fixes to let llcommon build as a .dylib.  It depends on PTH library.

---
 indra/llcommon/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/llcommon')

diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 4ba74ab837..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)
@@ -245,6 +247,7 @@ target_link_libraries(
     ${WINDOWS_LIBRARIES}
     ${BOOST_PROGRAM_OPTIONS_LIBRARY}
     ${BOOST_REGEX_LIBRARY}
+    ${PTH_LIBRARIES}
     )
 
 include(LLAddBuildTest)
-- 
cgit v1.2.3