diff options
| author | callum_linden <none@none> | 2012-11-12 16:55:20 -0800 |
|---|---|---|
| committer | callum_linden <none@none> | 2012-11-12 16:55:20 -0800 |
| commit | 586d878ef5c415ebf711e5b3a5ad220e9671e50b (patch) | |
| tree | d8be59b211a183ca751c2290ff6cc0451fdb0e36 /indra/cmake | |
| parent | 92acb99f6fc22aaaccc138187f874a90bd34529c (diff) | |
First round of fixes to make viewer work with Boost 1.52
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/Boost.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 2135f0584c..6b5af44a99 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -17,7 +17,7 @@ else (STANDALONE) set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) if (WINDOWS) - set(BOOST_VERSION 1_45) + set(BOOST_VERSION 1_52) if(MSVC80) set(BOOST_PROGRAM_OPTIONS_LIBRARY optimized libboost_program_options-vc80-mt-${BOOST_VERSION} @@ -50,9 +50,9 @@ else (STANDALONE) debug libboost_filesystem-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_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) + set(BOOST_REGEX_LIBRARY boost_regex-mt) + set(BOOST_SYSTEM_LIBRARY boost_system-mt) + set(BOOST_FILESYSTEM_LIBRARY boost_filesystem-mt) endif (WINDOWS) endif (STANDALONE) |