diff options
| author | David Seikel | 2011-02-20 17:43:37 +1000 |
|---|---|---|
| committer | David Seikel | 2011-02-20 17:43:37 +1000 |
| commit | 30cac27887ad0497168efb7d8dbc4209ee8b6a2f (patch) | |
| tree | e722eeffe993a85552ca31e83c24cff8c1d9e339 /linden/indra/cmake/Boost.cmake | |
| parent | Work around the endless bitching about webkit failing when you open the searc... (diff) | |
| parent | Fixed compile error in llmediaplugintest: lingering ll_init_apr (diff) | |
| download | meta-impy-30cac27887ad0497168efb7d8dbc4209ee8b6a2f.zip meta-impy-30cac27887ad0497168efb7d8dbc4209ee8b6a2f.tar.gz meta-impy-30cac27887ad0497168efb7d8dbc4209ee8b6a2f.tar.bz2 meta-impy-30cac27887ad0497168efb7d8dbc4209ee8b6a2f.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, 3 insertions, 1 deletions
diff --git a/linden/indra/cmake/Boost.cmake b/linden/indra/cmake/Boost.cmake index 7741615..665a162 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_36) | 17 | set(BOOST_VERSION 1_39) |
| 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,6 +25,8 @@ 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 | ||
| 28 | elseif (MSVC90) | 30 | elseif (MSVC90) |
| 29 | set(BOOST_PROGRAM_OPTIONS_LIBRARY | 31 | set(BOOST_PROGRAM_OPTIONS_LIBRARY |
| 30 | optimized libboost_program_options-vc90-mt-${BOOST_VERSION} | 32 | optimized libboost_program_options-vc90-mt-${BOOST_VERSION} |