aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/cmake/Boost.cmake
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/cmake/Boost.cmake')
-rw-r--r--linden/indra/cmake/Boost.cmake4
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/cmake/Boost.cmake b/linden/indra/cmake/Boost.cmake
index 7741615..665a162 100644
--- a/linden/indra/cmake/Boost.cmake
+++ b/linden/indra/cmake/Boost.cmake
@@ -14,7 +14,7 @@ else (STANDALONE)
14 set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) 14 set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
15 15
16 if (WINDOWS) 16 if (WINDOWS)
17 set(BOOST_VERSION 1_36) 17 set(BOOST_VERSION 1_39)
18 if (MSVC80) 18 if (MSVC80)
19 set(BOOST_PROGRAM_OPTIONS_LIBRARY 19 set(BOOST_PROGRAM_OPTIONS_LIBRARY
20 optimized libboost_program_options-vc80-mt-${BOOST_VERSION} 20 optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
@@ -25,6 +25,8 @@ else (STANDALONE)
25 set(BOOST_SIGNALS_LIBRARY 25 set(BOOST_SIGNALS_LIBRARY
26 optimized libboost_signals-vc80-mt-${BOOST_VERSION} 26 optimized libboost_signals-vc80-mt-${BOOST_VERSION}
27 debug libboost_signals-vc80-mt-gd-${BOOST_VERSION}) 27 debug libboost_signals-vc80-mt-gd-${BOOST_VERSION})
28 # Default support for VS2008 was lost in the move from 1.36 to 1.39.
29 # Remove this comment when this is fixed -- MC
28 elseif (MSVC90) 30 elseif (MSVC90)
29 set(BOOST_PROGRAM_OPTIONS_LIBRARY 31 set(BOOST_PROGRAM_OPTIONS_LIBRARY
30 optimized libboost_program_options-vc90-mt-${BOOST_VERSION} 32 optimized libboost_program_options-vc90-mt-${BOOST_VERSION}