diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-11-20 14:46:24 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-11-20 14:46:24 -0500 |
| commit | 557293137c052d81f78a559add2ccae57216c06d (patch) | |
| tree | 15b0d971740f517ad8c0e3827538403671f1dc0d /indra/cmake/Boost.cmake | |
| parent | 8b65c372501e1e7ca5fcaf2dcc7ffc9ff0840392 (diff) | |
| parent | e66dacddfd87ba6c7f116a87a5fc272edffae41d (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/cmake/Boost.cmake')
| -rw-r--r-- | indra/cmake/Boost.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index 2af0bc1b30..1acb2bbbfd 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -16,9 +16,9 @@ if (STANDALONE) else (STANDALONE) use_prebuilt_binary(boost) set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) + set(BOOST_VERSION "1.52") if (WINDOWS) - set(BOOST_VERSION 1_48) if(MSVC80) set(BOOST_PROGRAM_OPTIONS_LIBRARY optimized libboost_program_options-vc80-mt-${BOOST_VERSION} |