From 469438707dd61711540f7277ac43f65ac399a51b Mon Sep 17 00:00:00 2001
From: Monty Brandenberg <monty@lindenlab.com>
Date: Fri, 4 Apr 2014 16:30:50 -0400
Subject: Library updates and switch to 3d-llqtwebkit2 build products. SDL to
 1.2.15, c-ares to latest 1.10.0 build, Boost to 1.55.0 with coroutine
 updates/fixes, curl to 7.34.0, libpng to 1.6.8, openssl to 1.0.1e, zlib to
 latest 1.2.8 build, llqtwebkit built from 4.7.1 sources refactored and tested
 in 3p-llqtwebkit2 repository.

Windows is functional with a good number of warning messages
at runtime from libpng and KDU.  MoaP/slplugin functioning.
---
 indra/cmake/Boost.cmake | 11 +++++++++++
 1 file changed, 11 insertions(+)

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

diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index cff762e1f0..63e91a37be 100755
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -8,6 +8,7 @@ if (STANDALONE)
   include(FindBoost)
 
   set(BOOST_CONTEXT_LIBRARY boost_context-mt)
+  set(BOOST_COROUTINE_LIBRARY boost_coroutine-mt)
   set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
   set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
   set(BOOST_REGEX_LIBRARY boost_regex-mt)
@@ -21,6 +22,7 @@ else (STANDALONE)
 
   if (WINDOWS)
     if(MSVC80)
+      # This should be obsolete at this point
       set(BOOST_CONTEXT_LIBRARY 
           optimized libboost_context-vc80-mt-${BOOST_VERSION}
           debug libboost_context-vc80-mt-gd-${BOOST_VERSION})
@@ -47,6 +49,9 @@ else (STANDALONE)
       set(BOOST_CONTEXT_LIBRARY 
           optimized libboost_context-mt
           debug libboost_context-mt-gd)
+      set(BOOST_COROUTINE_LIBRARY 
+          optimized libboost_coroutine-mt
+          debug libboost_coroutine-mt-gd)
       set(BOOST_FILESYSTEM_LIBRARY 
           optimized libboost_filesystem-mt
           debug libboost_filesystem-mt-gd)
@@ -70,6 +75,9 @@ else (STANDALONE)
     set(BOOST_CONTEXT_LIBRARY
         optimized boost_context-mt
         debug boost_context-mt-d)
+    set(BOOST_COROUTINE_LIBRARY
+        optimized boost_coroutine-mt
+        debug boost_coroutine-mt-d)
     set(BOOST_FILESYSTEM_LIBRARY
         optimized boost_filesystem-mt
         debug boost_filesystem-mt-d)
@@ -92,6 +100,9 @@ else (STANDALONE)
     set(BOOST_CONTEXT_LIBRARY
         optimized boost_context-mt
         debug boost_context-mt-d)
+    set(BOOST_COROUTINE_LIBRARY
+        optimized boost_coroutine-mt
+        debug boost_coroutine-mt-d)
     set(BOOST_FILESYSTEM_LIBRARY
         optimized boost_filesystem-mt
         debug boost_filesystem-mt-d)
-- 
cgit v1.2.3


From 1422f8961285c24f88b6c10fd4381ae78be93b6c Mon Sep 17 00:00:00 2001
From: Monty Brandenberg <monty@lindenlab.com>
Date: Fri, 4 Apr 2014 21:59:15 +0000
Subject: Linux:  Finish new Boost dependencies to get Linux building again.

---
 indra/cmake/Boost.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 63e91a37be..348521a77c 100755
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -18,7 +18,7 @@ if (STANDALONE)
 else (STANDALONE)
   use_prebuilt_binary(boost)
   set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
-  set(BOOST_VERSION "1.52")
+  set(BOOST_VERSION "1.55")
 
   if (WINDOWS)
     if(MSVC80)
-- 
cgit v1.2.3