summaryrefslogtreecommitdiff
path: root/indra/cmake/Boost.cmake
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-01-10 14:51:59 -0800
committerMerov Linden <merov@lindenlab.com>2013-01-10 14:51:59 -0800
commit573ab07a40acc78e28ae390331d862d3f858bb07 (patch)
tree7944ca93182468372186d202e45ba1ddcd7635b2 /indra/cmake/Boost.cmake
parent45e72bf3cbd08eef96663d569cec3ecae198a8e4 (diff)
parentfde976cf2bf9740dcd821ad37f0747beaabe34dd (diff)
Merge pull from lindenlab/viewer-beta
Diffstat (limited to 'indra/cmake/Boost.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..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}