summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-11-16 11:07:36 -0500
committerNat Goodspeed <nat@lindenlab.com>2012-11-16 11:07:36 -0500
commiteca0637d153e3a9bde563c9521098a7577ba5975 (patch)
tree86024d9e830bca4c8a2820981151d31f01e63c4a /indra/cmake
parent185169cbbecebe2a35dbd937d6fb4e0a30fa1832 (diff)
parent12a3f2ea72893827a3b34e2f95b462387e844c9d (diff)
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/cmake')
-rw-r--r--indra/cmake/Boost.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 2af0bc1b30..dfa59bcb7e 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake
@@ -18,8 +18,8 @@ else (STANDALONE)
set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
if (WINDOWS)
- set(BOOST_VERSION 1_48)
if(MSVC80)
+ set(BOOST_VERSION 1_52)
set(BOOST_PROGRAM_OPTIONS_LIBRARY
optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION})