From bc776f516b8dd5e87bc3aa29cbdcf81e27bffefb Mon Sep 17 00:00:00 2001
From: Chalice Yao <chaosstar@gmail.com>
Date: Thu, 25 Aug 2011 20:52:52 +0200
Subject: [PATCH] Added libboost Wave and Thread to cmake.

---
 indra/cmake/Boost.cmake      | 16 ++++++++++++++++
 indra/newview/CMakeLists.txt |  2 ++
 2 files changed, 18 insertions(+)

diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 2135f0584c..e5d92f7004 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -12,6 +12,8 @@ if (STANDALONE)
   set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
   set(BOOST_SYSTEM_LIBRARY boost_system-mt)
   set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
+  set(BOOST_WAVE_LIBRARY boost_wave-mt)
+  set(BOOST_THREAD_LIBRARY boost_thread-mt)
 else (STANDALONE)
   use_prebuilt_binary(boost)
   set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
@@ -34,6 +36,12 @@ else (STANDALONE)
       set(BOOST_FILESYSTEM_LIBRARY 
           optimized libboost_filesystem-vc80-mt-${BOOST_VERSION}
           debug libboost_filesystem-vc80-mt-gd-${BOOST_VERSION})
+      set(BOOST_WAVE_LIBRARY 
+          optimized libboost_wave-vc80-mt-${BOOST_VERSION}
+          debug libboost_wave-vc80-mt-gd-${BOOST_VERSION})
+      set(BOOST_THREAD_LIBRARY 
+          optimized libboost_thread-vc80-mt-${BOOST_VERSION}
+          debug libboost_thread-vc80-mt-gd-${BOOST_VERSION})
     else(MSVC80)
       # MSVC 10.0 config
       set(BOOST_PROGRAM_OPTIONS_LIBRARY 
@@ -48,11 +56,19 @@ else (STANDALONE)
       set(BOOST_FILESYSTEM_LIBRARY 
           optimized libboost_filesystem-vc100-mt-${BOOST_VERSION}
           debug libboost_filesystem-vc100-mt-gd-${BOOST_VERSION})    
+      set(BOOST_WAVE_LIBRARY 
+          optimized libboost_wave-vc100-mt-${BOOST_VERSION}
+          debug libboost_wave-vc100-mt-gd-${BOOST_VERSION})
+      set(BOOST_THREAD_LIBRARY 
+          optimized libboost_thread-vc100-mt-${BOOST_VERSION}
+          debug libboost_thread-vc100-mt-gd-${BOOST_VERSION})
     endif (MSVC80)
   elseif (DARWIN OR LINUX)
     set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options)
     set(BOOST_REGEX_LIBRARY boost_regex)
     set(BOOST_SYSTEM_LIBRARY boost_system)
     set(BOOST_FILESYSTEM_LIBRARY boost_filesystem)
+    set(BOOST_WAVE_LIBRARY boost_wave)
+    set(BOOST_THREAD_LIBRARY boost_thread)
   endif (WINDOWS)
 endif (STANDALONE)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 1b883cba70..19c58774b6 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1915,6 +1915,8 @@ target_link_libraries(${VIEWER_BINARY_NAME}
     ${viewer_LIBRARIES}
     ${BOOST_PROGRAM_OPTIONS_LIBRARY}
     ${BOOST_REGEX_LIBRARY}
+    ${BOOST_WAVE_LIBRARY}
+    ${BOOST_THREAD_LIBRARY}
     ${DBUSGLIB_LIBRARIES}
     ${OPENGL_LIBRARIES}
     ${FMODWRAPPER_LIBRARY} # must come after LLAudio