From 7bc1a453f219122629bd526166a127ff75376f06 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Wed, 19 Aug 2015 12:04:23 -0700
Subject: Try attaching the bost libraries directly to CoreHttp

---
 indra/cmake/LLCoreHttp.cmake | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra/cmake/LLCoreHttp.cmake')

diff --git a/indra/cmake/LLCoreHttp.cmake b/indra/cmake/LLCoreHttp.cmake
index 61e4b23d98..cc2e32e8b1 100755
--- a/indra/cmake/LLCoreHttp.cmake
+++ b/indra/cmake/LLCoreHttp.cmake
@@ -13,4 +13,7 @@ set(LLCOREHTTP_INCLUDE_DIRS
     ${BOOST_INCLUDE_DIRS}
     )
 
-set(LLCOREHTTP_LIBRARIES llcorehttp)
+set(LLCOREHTTP_LIBRARIES llcorehttp
+    ${BOOST_COROUTINE_LIBRARY}
+    ${BOOST_CONTEXT_LIBRARY}
+    ${BOOST_SYSTEM_LIBRARY})
-- 
cgit v1.2.3


From 2d2c90157dbc75c4f1b4a8ac35ae67e005bc98b4 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Wed, 23 Sep 2015 15:48:06 -0700
Subject: Remove ares dependency from build.

---
 indra/cmake/LLCoreHttp.cmake | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/cmake/LLCoreHttp.cmake')

diff --git a/indra/cmake/LLCoreHttp.cmake b/indra/cmake/LLCoreHttp.cmake
index cc2e32e8b1..379ae207de 100755
--- a/indra/cmake/LLCoreHttp.cmake
+++ b/indra/cmake/LLCoreHttp.cmake
@@ -1,13 +1,11 @@
 # -*- 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}
-- 
cgit v1.2.3