diff options
| author | David Seikel | 2011-03-01 18:08:42 +1000 |
|---|---|---|
| committer | David Seikel | 2011-03-01 18:08:42 +1000 |
| commit | 577067837ca99312f796ac701fe5c8db892be41e (patch) | |
| tree | 91f93e0a207e4f0d1646d3c60ec9912c3e813b87 /linden/indra/cmake/Boost.cmake | |
| parent | Reduce the logging spam to warnings. Debug was too much. (diff) | |
| parent | Switched to Phoenix Viewers Boost 1.43 libs for Windows (diff) | |
| download | meta-impy-577067837ca99312f796ac701fe5c8db892be41e.zip meta-impy-577067837ca99312f796ac701fe5c8db892be41e.tar.gz meta-impy-577067837ca99312f796ac701fe5c8db892be41e.tar.bz2 meta-impy-577067837ca99312f796ac701fe5c8db892be41e.tar.xz | |
Merge remote-tracking branch 'mccabe/weekly' into weekly
Diffstat (limited to 'linden/indra/cmake/Boost.cmake')
| -rw-r--r-- | linden/indra/cmake/Boost.cmake | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/linden/indra/cmake/Boost.cmake b/linden/indra/cmake/Boost.cmake index 665a162..75ac62e 100644 --- a/linden/indra/cmake/Boost.cmake +++ b/linden/indra/cmake/Boost.cmake | |||
| @@ -14,7 +14,7 @@ else (STANDALONE) | |||
| 14 | set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) | 14 | set(Boost_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) |
| 15 | 15 | ||
| 16 | if (WINDOWS) | 16 | if (WINDOWS) |
| 17 | set(BOOST_VERSION 1_39) | 17 | set(BOOST_VERSION 1_43) |
| 18 | if (MSVC80) | 18 | if (MSVC80) |
| 19 | set(BOOST_PROGRAM_OPTIONS_LIBRARY | 19 | set(BOOST_PROGRAM_OPTIONS_LIBRARY |
| 20 | optimized libboost_program_options-vc80-mt-${BOOST_VERSION} | 20 | optimized libboost_program_options-vc80-mt-${BOOST_VERSION} |
| @@ -25,8 +25,6 @@ else (STANDALONE) | |||
| 25 | set(BOOST_SIGNALS_LIBRARY | 25 | set(BOOST_SIGNALS_LIBRARY |
| 26 | optimized libboost_signals-vc80-mt-${BOOST_VERSION} | 26 | optimized libboost_signals-vc80-mt-${BOOST_VERSION} |
| 27 | debug libboost_signals-vc80-mt-gd-${BOOST_VERSION}) | 27 | debug libboost_signals-vc80-mt-gd-${BOOST_VERSION}) |
| 28 | # Default support for VS2008 was lost in the move from 1.36 to 1.39. | ||
| 29 | # Remove this comment when this is fixed -- MC | ||
| 30 | elseif (MSVC90) | 28 | elseif (MSVC90) |
| 31 | set(BOOST_PROGRAM_OPTIONS_LIBRARY | 29 | set(BOOST_PROGRAM_OPTIONS_LIBRARY |
| 32 | optimized libboost_program_options-vc90-mt-${BOOST_VERSION} | 30 | optimized libboost_program_options-vc90-mt-${BOOST_VERSION} |