diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2009-02-18 21:10:16 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2009-02-18 21:10:16 +0000 |
| commit | abdc99f21b542c4fea67030ddbd7166c9d1c6c63 (patch) | |
| tree | 3e984e405adfdec189ca8a047daca5250737ffbf /indra/cmake/Boost.cmake | |
| parent | 34412f0530cf6a411b4de906a8e9da59cbcb3a85 (diff) | |
Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
Diffstat (limited to 'indra/cmake/Boost.cmake')
| -rw-r--r-- | indra/cmake/Boost.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake index a7db67c915..0578ae95ff 100644 --- a/indra/cmake/Boost.cmake +++ b/indra/cmake/Boost.cmake @@ -28,14 +28,14 @@ else (STANDALONE) debug libboost_signals-vc71-mt-sgd-${BOOST_VERSION}) else (MSVC71) set(BOOST_PROGRAM_OPTIONS_LIBRARY - optimized libboost_program_options-vc80-mt-s-${BOOST_VERSION} - debug libboost_program_options-vc80-mt-sgd-${BOOST_VERSION}) + optimized libboost_program_options-vc80-mt-${BOOST_VERSION} + debug libboost_program_options-vc80-mt-gd-${BOOST_VERSION}) set(BOOST_REGEX_LIBRARY - optimized libboost_regex-vc80-mt-s-${BOOST_VERSION} - debug libboost_regex-vc80-mt-sgd-${BOOST_VERSION}) + optimized libboost_regex-vc80-mt-${BOOST_VERSION} + debug libboost_regex-vc80-mt-gd-${BOOST_VERSION}) set(BOOST_SIGNALS_LIBRARY - optimized libboost_signals-vc80-mt-s-${BOOST_VERSION} - debug libboost_signals-vc80-mt-sgd-${BOOST_VERSION}) + optimized libboost_signals-vc80-mt-${BOOST_VERSION} + debug libboost_signals-vc80-mt-gd-${BOOST_VERSION}) endif (MSVC71) elseif (DARWIN) set(BOOST_PROGRAM_OPTIONS_LIBRARY boost_program_options-mt) |