From fdc5192074317394e15b5a47892e30b7ffc8a195 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Tue, 31 Aug 2010 19:15:12 +0200
Subject: pull boost 1.39 from LL for Linux32, add boost system and boost
 filesystem to cmake

---
 linden/indra/cmake/Boost.cmake      | 7 ++++++-
 linden/indra/newview/CMakeLists.txt | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'linden/indra')

diff --git a/linden/indra/cmake/Boost.cmake b/linden/indra/cmake/Boost.cmake
index a84a09f..90f39d2 100644
--- a/linden/indra/cmake/Boost.cmake
+++ b/linden/indra/cmake/Boost.cmake
@@ -6,10 +6,11 @@ set(Boost_FIND_REQUIRED ON)
 
 if (STANDALONE)
   include(FindBoost)
-
+  set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
   set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
   set(BOOST_REGEX_LIBRARY boost_regex-mt)
   set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
+  set(BOOST_SYSTEM_LIBRARY boost_filesystem-mt)
 else (STANDALONE)
   use_prebuilt_binary(boost)
   set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
@@ -38,12 +39,16 @@ else (STANDALONE)
           debug libboost_signals-vc90-mt-gd-${BOOST_VERSION})
     endif (MSVC80)
   elseif (DARWIN)
+    set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
     set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
     set(BOOST_REGEX_LIBRARY boost_regex-mt)
     set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
+    set(BOOST_SYSTEM_LIBRARY boost_filesystem-mt)
   elseif (LINUX)
+    set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt)
     set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt)
     set(BOOST_REGEX_LIBRARY boost_regex-mt)
     set(BOOST_SIGNALS_LIBRARY boost_signals-mt)
+    set(BOOST_SYSTEM_LIBRARY boost_system-mt)
   endif (WINDOWS)
 endif (STANDALONE)
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index c047a0f..cd4acdc 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1346,9 +1346,11 @@ target_link_libraries(${VIEWER_BINARY_NAME}
     ${LLCOMMON_LIBRARIES}
     ${NDOF_LIBRARY}
     ${viewer_LIBRARIES}
+    ${BOOST_FILESYSTEM_LIBRARY}
     ${BOOST_PROGRAM_OPTIONS_LIBRARY}
     ${BOOST_REGEX_LIBRARY}
     ${BOOST_SIGNALS_LIBRARY}
+    ${BOOST_SYSTEM_LIBRARY}
     ${DBUSGLIB_LIBRARIES}
     ${OPENGL_LIBRARIES}
     ${FMODWRAPPER_LIBRARY}
-- 
cgit v1.1