diff options
author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-12-04 15:03:34 -0800 |
---|---|---|
committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2012-12-04 15:03:34 -0800 |
commit | 7fe4fbe6741c4a5f140bf1b52ced9957d408a53a (patch) | |
tree | 96c5d4021a43b57e6e47cbb34edad12c1e7016b0 /indra/cmake/Boost.cmake | |
parent | fddd386804889f491d51b6ea597f18ec6fd8170c (diff) | |
parent | 40e78a80cc293874216cdc8730d93cba8e987052 (diff) |
Pull in upstream viewer-development via viewer-lion
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} |