Merged in lindenlab/viewer-release

12 files changed, 42 insertions, 84 deletions

diff --git a/indra/cmake/00-COMPILE-LINK-RUN.txt b/indra/cmake/00-COMPILE-LINK-RUN.txt
index 49b899c50d..162b22865c 100644
--- a/indra/cmake/00-COMPILE-LINK-RUN.txt
+++ b/indra/cmake/00-COMPILE-LINK-RUN.txt
@@ -51,7 +51,6 @@ Compilation
                    WINVER=0x0501                 "                   "
                    _WIN32_WINNT=0x0501           "                   "
                    LL_OS_DRAGDROP_ENABLED=1      "                   "
-                   CARES_STATICLIB               "                   "
                    LIB_NDOF=1                    "                   "
 
     ----------------------------------------------------------------------------
@@ -109,7 +108,6 @@ Compilation
                                          DEBUG_INFO=1
                    LL_DARWIN=1                   "                   "
                    LL_OS_DRAGDROP_ENABLED=1      "                   "
-                   CARES_STATICLIB               "                   "
                    LIB_NDOF=1                    "                   "
 
     ----------------------------------------------------------------------------
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 25e54b7cbd..180a84dbcf 100755
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -123,3 +123,9 @@ else (USESYSTEMLIBS)
         debug boost_thread-mt-d)
   endif (WINDOWS)
 endif (USESYSTEMLIBS)
+
+if (LINUX)
+    set(BOOST_SYSTEM_LIBRARY ${BOOST_SYSTEM_LIBRARY} rt)
+    set(BOOST_THREAD_LIBRARY ${BOOST_THREAD_LIBRARY} rt)
+endif (LINUX)
+
diff --git a/indra/cmake/CARes.cmake b/indra/cmake/CARes.cmake
deleted file mode 100755
index baa55aa49d..0000000000
--- a/indra/cmake/CARes.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- cmake -*-
-include(Linking)
-include(Prebuilt)
-
-set(CARES_FIND_QUIETLY ON)
-set(CARES_FIND_REQUIRED ON)
-
-if (USESYSTEMLIBS)
-  include(FindCARes)
-else (USESYSTEMLIBS)
-    use_prebuilt_binary(ares)
-    add_definitions("-DCARES_STATICLIB")
-    if (WINDOWS)
-        set(CARES_LIBRARIES areslib)
-    elseif (DARWIN)
-       set(CARES_LIBRARIES cares)
-    else (WINDOWS)
-        set(CARES_LIBRARIES cares)
-    endif (WINDOWS)
-    set(CARES_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include/ares)
-endif (USESYSTEMLIBS)
diff --git a/indra/cmake/CMakeLists.txt b/indra/cmake/CMakeLists.txt
index 4dd69649d0..04a2a16c27 100755
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -13,7 +13,6 @@ set(cmake_SOURCE_FILES
     BerkeleyDB.cmake
     Boost.cmake
     BuildVersion.cmake
-    CARes.cmake
     CEFPlugin.cmake
     CMakeCopyIfDifferent.cmake
     ConfigurePkgConfig.cmake
@@ -28,7 +27,6 @@ set(cmake_SOURCE_FILES
     FindAPR.cmake
     FindAutobuild.cmake
     FindBerkeleyDB.cmake
-    FindCARes.cmake
     FindFMODEX.cmake
     FindGLH.cmake
     FindGoogleBreakpad.cmake
@@ -59,7 +57,6 @@ set(cmake_SOURCE_FILES
     JsonCpp.cmake
     LLAddBuildTest.cmake
     LLAppearance.cmake
-    LLAppearanceUtility.cmake
     LLAudio.cmake
     LLCharacter.cmake
     LLCommon.cmake
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index a6fd756c88..70d85b864c 100755
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -22,10 +22,8 @@ if(WINDOWS)
         SLVoice.exe
         ca-bundle.crt
         libsndfile-1.dll
-        vivoxplatform.dll
         vivoxsdk.dll
         ortp.dll
-        zlib1.dll
         vivoxoal.dll
         )
 
diff --git a/indra/cmake/FindCARes.cmake b/indra/cmake/FindCARes.cmake
deleted file mode 100755
index 1ed5b32913..0000000000
--- a/indra/cmake/FindCARes.cmake
+++ /dev/null
@@ -1,48 +0,0 @@
-# -*- cmake -*-
-
-# - Find c-ares
-# Find the c-ares includes and library
-# This module defines
-#  CARES_INCLUDE_DIR, where to find ares.h, etc.
-#  CARES_LIBRARIES, the libraries needed to use c-ares.
-#  CARES_FOUND, If false, do not try to use c-ares.
-# also defined, but not for general use are
-#  CARES_LIBRARY, where to find the c-ares library.
-
-FIND_PATH(CARES_INCLUDE_DIR ares.h
-/usr/local/include
-/usr/include
-)
-
-SET(CARES_NAMES ${CARES_NAMES} cares)
-FIND_LIBRARY(CARES_LIBRARY
-  NAMES ${CARES_NAMES}
-  PATHS /usr/lib /usr/local/lib
-  )
-
-IF (CARES_LIBRARY AND CARES_INCLUDE_DIR)
-    SET(CARES_LIBRARIES ${CARES_LIBRARY})
-    SET(CARES_FOUND "YES")
-ELSE (CARES_LIBRARY AND CARES_INCLUDE_DIR)
-  SET(CARES_FOUND "NO")
-ENDIF (CARES_LIBRARY AND CARES_INCLUDE_DIR)
-
-
-IF (CARES_FOUND)
-   IF (NOT CARES_FIND_QUIETLY)
-      MESSAGE(STATUS "Found c-ares: ${CARES_LIBRARIES}")
-   ENDIF (NOT CARES_FIND_QUIETLY)
-ELSE (CARES_FOUND)
-   IF (CARES_FIND_REQUIRED)
-      MESSAGE(FATAL_ERROR "Could not find c-ares library")
-   ENDIF (CARES_FIND_REQUIRED)
-ENDIF (CARES_FOUND)
-
-# Deprecated declarations.
-SET (NATIVE_CARES_INCLUDE_PATH ${CARES_INCLUDE_DIR} )
-GET_FILENAME_COMPONENT (NATIVE_CARES_LIB_PATH ${CARES_LIBRARY} PATH)
-
-MARK_AS_ADVANCED(
-  CARES_LIBRARY
-  CARES_INCLUDE_DIR
-  )
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index ac5c5c6a2a..db8b95dbe2 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -35,6 +35,7 @@ INCLUDE(GoogleMock)
     ${APRUTIL_LIBRARIES}
     ${APR_LIBRARIES}
     llcommon
+    llcorehttp
     )
   IF(NOT "${project}" STREQUAL "llmath")
     # add llmath as a dep unless the tested module *is* llmath!
@@ -49,6 +50,9 @@ INCLUDE(GoogleMock)
     ${GOOGLEMOCK_INCLUDE_DIRS}
     )
   SET(alltest_LIBRARIES
+    ${BOOST_COROUTINE_LIBRARY}
+    ${BOOST_CONTEXT_LIBRARY}
+    ${BOOST_SYSTEM_LIBRARY}
     ${GOOGLEMOCK_LIBRARIES}
     ${PTHREAD_LIBRARY}
     ${WINDOWS_LIBRARIES}
@@ -191,6 +195,9 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
 
   SET(libraries
     ${library_dependencies}
+    ${BOOST_COROUTINE_LIBRARY}
+    ${BOOST_CONTEXT_LIBRARY}
+    ${BOOST_SYSTEM_LIBRARY}
     ${GOOGLEMOCK_LIBRARIES}
     ${PTHREAD_LIBRARY}
     )
diff --git a/indra/cmake/LLAppearance.cmake b/indra/cmake/LLAppearance.cmake
index bd3795a526..ae265d07e3 100644
--- a/indra/cmake/LLAppearance.cmake
+++ b/indra/cmake/LLAppearance.cmake
@@ -1,6 +1,9 @@
 # -*- cmake -*-
 
 include(Variables)
+include(Boost)
+include(LLMessage)
+include(LLCoreHttp)
 
 set(LLAPPEARANCE_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llappearance
@@ -12,6 +15,13 @@ if (BUILD_HEADLESS)
     )
 endif (BUILD_HEADLESS)
 
-set(LLAPPEARANCE_LIBRARIES llappearance)
+set(LLAPPEARANCE_LIBRARIES llappearance
+    llmessage
+    llcorehttp
+    ${BOOST_COROUTINE_LIBRARY}
+    ${BOOST_CONTEXT_LIBRARY}
+    ${BOOST_SYSTEM_LIBRARY}
+    )
+
 
 
diff --git a/indra/cmake/LLAppearanceUtility.cmake b/indra/cmake/LLAppearanceUtility.cmake
index 709b91c134..28b49bf75f 100644
--- a/indra/cmake/LLAppearanceUtility.cmake
+++ b/indra/cmake/LLAppearanceUtility.cmake
@@ -1,5 +1,6 @@
 # -*- cmake -*-
 include(Prebuilt)
+include(Boost)
 
 # Linux proprietary build only
 if (INSTALL_PROPRIETARY)
@@ -10,3 +11,4 @@ if (INSTALL_PROPRIETARY)
     endif (LINUX)
 endif (INSTALL_PROPRIETARY)
 
+
diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake
index b52556a73e..b50b4bcdb2 100755
--- a/indra/cmake/LLCommon.cmake
+++ b/indra/cmake/LLCommon.cmake
@@ -19,9 +19,19 @@ if (LINUX)
     # In order to support using ld.gold on linux, we need to explicitely
     # specify all libraries that llcommon uses.
     # llcommon uses `clock_gettime' which is provided by librt on linux.
-    set(LLCOMMON_LIBRARIES llcommon rt)
+    set(LLCOMMON_LIBRARIES llcommon 
+        ${BOOST_COROUTINE_LIBRARY} 
+        ${BOOST_CONTEXT_LIBRARY} 
+        ${BOOST_THREAD_LIBRARY} 
+        ${BOOST_SYSTEM_LIBRARY} 
+        rt
+        )
 else (LINUX)
-    set(LLCOMMON_LIBRARIES llcommon)
+    set(LLCOMMON_LIBRARIES llcommon
+        ${BOOST_COROUTINE_LIBRARY} 
+        ${BOOST_CONTEXT_LIBRARY} 
+        ${BOOST_THREAD_LIBRARY} 
+        ${BOOST_SYSTEM_LIBRARY} )
 endif (LINUX)
 
 # add_definitions(${TCMALLOC_FLAG})
diff --git a/indra/cmake/LLCoreHttp.cmake b/indra/cmake/LLCoreHttp.cmake
index 61e4b23d98..379ae207de 100755
--- a/indra/cmake/LLCoreHttp.cmake
+++ b/indra/cmake/LLCoreHttp.cmake
@@ -1,16 +1,17 @@
 # -*- cmake -*-
 
-include(CARes)
 include(CURL)
 include(OpenSSL)
 include(Boost)
 
 set(LLCOREHTTP_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llcorehttp
-    ${CARES_INCLUDE_DIRS}
     ${CURL_INCLUDE_DIRS}
     ${OPENSSL_INCLUDE_DIRS}
     ${BOOST_INCLUDE_DIRS}
     )
 
-set(LLCOREHTTP_LIBRARIES llcorehttp)
+set(LLCOREHTTP_LIBRARIES llcorehttp
+    ${BOOST_COROUTINE_LIBRARY}
+    ${BOOST_CONTEXT_LIBRARY}
+    ${BOOST_SYSTEM_LIBRARY})
diff --git a/indra/cmake/LLMessage.cmake b/indra/cmake/LLMessage.cmake
index 0143d04fd7..7be53ec0ec 100755
--- a/indra/cmake/LLMessage.cmake
+++ b/indra/cmake/LLMessage.cmake
@@ -1,13 +1,11 @@
 # -*- cmake -*-
 
-include(CARes)
 include(CURL)
 include(OpenSSL)
 include(XmlRpcEpi)
 
 set(LLMESSAGE_INCLUDE_DIRS
     ${LIBS_OPEN_DIR}/llmessage
-    ${CARES_INCLUDE_DIRS}
     ${CURL_INCLUDE_DIRS}
     ${OPENSSL_INCLUDE_DIRS}
     )