correct boost to work with both 2005/2008 (boost 1.43) and 2010 (boost 1.45) msvc2010

Tue, 28 Feb 2012 12:19:31 -0800

author
Tank_Master
date
Tue, 28 Feb 2012 12:19:31 -0800
branch
msvc2010
changeset 1648
9101a3b4d0a4
parent 1646
79d6b16169e1
child 1650
47a8b98f52c8

correct boost to work with both 2005/2008 (boost 1.43) and 2010 (boost 1.45)

indra/cmake/Boost.cmake file | annotate | diff | revisions
     1.1 --- a/indra/cmake/Boost.cmake	Tue Feb 28 10:37:57 2012 -0800
     1.2 +++ b/indra/cmake/Boost.cmake	Tue Feb 28 12:19:31 2012 -0800
     1.3 @@ -11,8 +11,8 @@
     1.4    set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
     1.5  
     1.6    if (WINDOWS)
     1.7 -    set(BOOST_VERSION 1_45)
     1.8      if (MSVC80)
     1.9 +    set(BOOST_VERSION 1_43)
    1.10        set(Boost_PROGRAM_OPTIONS_LIBRARY 
    1.11            optimized libboost_program_options-vc80-mt-${BOOST_VERSION}
    1.12            debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION})
    1.13 @@ -26,6 +26,7 @@
    1.14            optimized libboost_wave-vc80-mt-${BOOST_VERSION}
    1.15            debug libboost_wave-vc80-mt-gd-${BOOST_VERSION})
    1.16      elseif (MSVC90)
    1.17 +    set(BOOST_VERSION 1_43)
    1.18        set(Boost_PROGRAM_OPTIONS_LIBRARY 
    1.19            optimized libboost_program_options-vc90-mt-${BOOST_VERSION}
    1.20            debug libboost_program_options-vc90-mt-gd-${BOOST_VERSION})
    1.21 @@ -39,6 +40,7 @@
    1.22            optimized libboost_wave-vc90-mt-${BOOST_VERSION}
    1.23            debug libboost_wave-vc90-mt-gd-${BOOST_VERSION})
    1.24      elseif (MSVC10)
    1.25 +    set(BOOST_VERSION 1_45)
    1.26        set(Boost_PROGRAM_OPTIONS_LIBRARY 
    1.27            optimized libboost_program_options-vc100-mt-${BOOST_VERSION}
    1.28            debug libboost_program_options-vc100-mt-gd-${BOOST_VERSION})

mercurial